diff options
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_fdb.c | 6 | ||||
-rw-r--r-- | net/bridge/br_netlink.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 9ce430b4657c..ddf93efc133c 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -467,14 +467,14 @@ static int fdb_to_nud(const struct net_bridge_fdb_entry *fdb) | |||
467 | 467 | ||
468 | static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br, | 468 | static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br, |
469 | const struct net_bridge_fdb_entry *fdb, | 469 | const struct net_bridge_fdb_entry *fdb, |
470 | u32 pid, u32 seq, int type, unsigned int flags) | 470 | u32 portid, u32 seq, int type, unsigned int flags) |
471 | { | 471 | { |
472 | unsigned long now = jiffies; | 472 | unsigned long now = jiffies; |
473 | struct nda_cacheinfo ci; | 473 | struct nda_cacheinfo ci; |
474 | struct nlmsghdr *nlh; | 474 | struct nlmsghdr *nlh; |
475 | struct ndmsg *ndm; | 475 | struct ndmsg *ndm; |
476 | 476 | ||
477 | nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ndm), flags); | 477 | nlh = nlmsg_put(skb, portid, seq, type, sizeof(*ndm), flags); |
478 | if (nlh == NULL) | 478 | if (nlh == NULL) |
479 | return -EMSGSIZE; | 479 | return -EMSGSIZE; |
480 | 480 | ||
@@ -555,7 +555,7 @@ int br_fdb_dump(struct sk_buff *skb, | |||
555 | goto skip; | 555 | goto skip; |
556 | 556 | ||
557 | if (fdb_fill_info(skb, br, f, | 557 | if (fdb_fill_info(skb, br, f, |
558 | NETLINK_CB(cb->skb).pid, | 558 | NETLINK_CB(cb->skb).portid, |
559 | cb->nlh->nlmsg_seq, | 559 | cb->nlh->nlmsg_seq, |
560 | RTM_NEWNEIGH, | 560 | RTM_NEWNEIGH, |
561 | NLM_F_MULTI) < 0) | 561 | NLM_F_MULTI) < 0) |
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index fe41260fbf38..093f527276a3 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
@@ -127,7 +127,7 @@ static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) | |||
127 | goto skip; | 127 | goto skip; |
128 | 128 | ||
129 | if (br_fill_ifinfo(skb, port, | 129 | if (br_fill_ifinfo(skb, port, |
130 | NETLINK_CB(cb->skb).pid, | 130 | NETLINK_CB(cb->skb).portid, |
131 | cb->nlh->nlmsg_seq, RTM_NEWLINK, | 131 | cb->nlh->nlmsg_seq, RTM_NEWLINK, |
132 | NLM_F_MULTI) < 0) | 132 | NLM_F_MULTI) < 0) |
133 | break; | 133 | break; |