diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2016-11-11 16:15:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-11-11 16:15:22 +0100 |
| commit | a04dae9eb15a2629de75c4ddde44e677a356f93a (patch) | |
| tree | b7e4b1a0983c4882abbdba09107c09836e0ee0f0 /net/switchdev/switchdev.c | |
| parent | ALSA: hda - Fix typo (diff) | |
| parent | ALSA: doc: ReSTize img,spdif-in.txt (diff) | |
| download | wireguard-linux-a04dae9eb15a2629de75c4ddde44e677a356f93a.tar.xz wireguard-linux-a04dae9eb15a2629de75c4ddde44e677a356f93a.zip | |
Merge branch 'topic/restize-docs' into for-next
Diffstat (limited to 'net/switchdev/switchdev.c')
| -rw-r--r-- | net/switchdev/switchdev.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 02beb35f577f..3b95fe980fa2 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -771,6 +771,9 @@ int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, u32 mask = BR_LEARNING | BR_LEARNING_SYNC | BR_FLOOD; int err; + if (!netif_is_bridge_port(dev)) + return -EOPNOTSUPP; + err = switchdev_port_attr_get(dev, &attr); if (err && err != -EOPNOTSUPP) return err; @@ -926,6 +929,9 @@ int switchdev_port_bridge_setlink(struct net_device *dev, struct nlattr *afspec; int err = 0; + if (!netif_is_bridge_port(dev)) + return -EOPNOTSUPP; + protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_PROTINFO); if (protinfo) { @@ -959,6 +965,9 @@ int switchdev_port_bridge_dellink(struct net_device *dev, { struct nlattr *afspec; + if (!netif_is_bridge_port(dev)) + return -EOPNOTSUPP; + afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC); if (afspec) |