diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-03-10 11:30:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-19 04:00:02 +0100 |
| commit | 1c01fe14a87332cc88266fbd6e598319322eb96f (patch) | |
| tree | e80491a8120724db96f7f6c6d2e2334d33383e6c /drivers/net | |
| parent | bonding: check return value of nofitier when changing type (diff) | |
| download | linux-1c01fe14a87332cc88266fbd6e598319322eb96f.tar.xz linux-1c01fe14a87332cc88266fbd6e598319322eb96f.zip | |
net: forbid underlaying devices to change its type
It's not desired for underlaying devices to change type. At the time,
there is for example possible to have bond with changed type from
Ethernet to Infiniband as a port of a bridge. This patch fixes this.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/macvlan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 40faa368b07a..445e73c343ba 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -748,6 +748,9 @@ static int macvlan_device_event(struct notifier_block *unused, list_for_each_entry_safe(vlan, next, &port->vlans, list) vlan->dev->rtnl_link_ops->dellink(vlan->dev, NULL); break; + case NETDEV_PRE_TYPE_CHANGE: + /* Forbid underlaying device to change its type. */ + return NOTIFY_BAD; } return NOTIFY_DONE; } |