projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
net
/
bridge
/
br_netlink.c
diff --git
a/net/bridge/br_netlink.c
b/net/bridge/br_netlink.c
index 0e4ddb81610d90ff51a45835424cef547bba73bf..4b5c236998ff1010831711a17b773e16c7d8ba58 100644
(file)
--- a/
net/bridge/br_netlink.c
+++ b/
net/bridge/br_netlink.c
@@
-394,7
+394,7
@@
errout:
* Dump information about all ports, in response to GETLINK
*/
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
* Dump information about all ports, in response to GETLINK
*/
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
- struct net_device *dev, u32 filter_mask)
+ struct net_device *dev, u32 filter_mask
, int nlflags
)
{
struct net_bridge_port *port = br_port_get_rtnl(dev);
{
struct net_bridge_port *port = br_port_get_rtnl(dev);
@@
-402,7
+402,7
@@
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
!(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED))
return 0;
!(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED))
return 0;
- return br_fill_ifinfo(skb, port, pid, seq, RTM_NEWLINK,
NLM_F_MULTI
,
+ return br_fill_ifinfo(skb, port, pid, seq, RTM_NEWLINK,
nlflags
,
filter_mask, dev);
}
filter_mask, dev);
}