aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorRoopa Prabhu <roopa@cumulusnetworks.com>2015-01-30 01:40:12 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-02 02:16:33 -0500
commitadd511b38266aa10c1079f9248854e6a415c4dc2 (patch)
treef2668d24dc561031d29c0af17c710ecc082eb94b /include/linux/netdevice.h
parentaafb3e98b27977148c8c86499684f8f5c3decfbb (diff)
bridge: add flags argument to ndo_bridge_setlink and ndo_bridge_dellink
bridge flags are needed inside ndo_bridge_setlink/dellink handlers to avoid another call to parse IFLA_AF_SPEC inside these handlers This is used later in this series Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3d37c6eb1732..16251e96e6aa 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1154,13 +1154,15 @@ struct net_device_ops {
1154 int idx); 1154 int idx);
1155 1155
1156 int (*ndo_bridge_setlink)(struct net_device *dev, 1156 int (*ndo_bridge_setlink)(struct net_device *dev,
1157 struct nlmsghdr *nlh); 1157 struct nlmsghdr *nlh,
1158 u16 flags);
1158 int (*ndo_bridge_getlink)(struct sk_buff *skb, 1159 int (*ndo_bridge_getlink)(struct sk_buff *skb,
1159 u32 pid, u32 seq, 1160 u32 pid, u32 seq,
1160 struct net_device *dev, 1161 struct net_device *dev,
1161 u32 filter_mask); 1162 u32 filter_mask);
1162 int (*ndo_bridge_dellink)(struct net_device *dev, 1163 int (*ndo_bridge_dellink)(struct net_device *dev,
1163 struct nlmsghdr *nlh); 1164 struct nlmsghdr *nlh,
1165 u16 flags);
1164 int (*ndo_change_carrier)(struct net_device *dev, 1166 int (*ndo_change_carrier)(struct net_device *dev,
1165 bool new_carrier); 1167 bool new_carrier);
1166 int (*ndo_get_phys_port_id)(struct net_device *dev, 1168 int (*ndo_get_phys_port_id)(struct net_device *dev,