Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 0 deletions

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 6f145b592a53..017801f9dbaa 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -768,6 +768,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;
@@ -923,6 +926,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) {
@@ -956,6 +962,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)