diff options
| author | Roman Mashak <mrv@mojatatu.com> | 2020-05-02 03:34:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-05 22:38:59 +0200 |
| commit | 38212bb31fe923d0a2c6299bd2adfbb84cddef2a (patch) | |
| tree | 5ee7a48a1599641bb542d1341f66c74c8bbe4e88 /net/core/neighbour.c | |
| parent | net: broadcom: fix a mistake about ioremap resource (diff) | |
| download | linux-38212bb31fe923d0a2c6299bd2adfbb84cddef2a.tar.xz linux-38212bb31fe923d0a2c6299bd2adfbb84cddef2a.zip | |
neigh: send protocol value in neighbor create notification
When a new neighbor entry has been added, event is generated but it does not
include protocol, because its value is assigned after the event notification
routine has run, so move protocol assignment code earlier.
Fixes: df9b0e30d44c ("neighbor: Add protocol attribute")
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/neighbour.c')
| -rw-r--r-- | net/core/neighbour.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 39d37d0ef575..116139233d57 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1956,6 +1956,9 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, NEIGH_UPDATE_F_OVERRIDE_ISROUTER); } + if (protocol) + neigh->protocol = protocol; + if (ndm->ndm_flags & NTF_EXT_LEARNED) flags |= NEIGH_UPDATE_F_EXT_LEARNED; @@ -1969,9 +1972,6 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, err = __neigh_update(neigh, lladdr, ndm->ndm_state, flags, NETLINK_CB(skb).portid, extack); - if (protocol) - neigh->protocol = protocol; - neigh_release(neigh); out: |