diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2019-02-01 11:05:27 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-02-01 11:05:35 +0100 |
| commit | 752cfee90d11e280d727617bf8d6df894141e157 (patch) | |
| tree | c55feff5c93af364fe2212d6b2942abb3748e05c /net/ax25/ax25_ip.c | |
| parent | 5ac4a12df58121f0cf874b518406ec2a8e2d4ac4 (diff) | |
| parent | fa6821cbf1d9724284ef0906c9a01a5fbf13a35c (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next so that we get the changes from net, which would
otherwise conflict with the NLA_POLICY_NESTED/_ARRAY changes.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/ax25/ax25_ip.c')
| -rw-r--r-- | net/ax25/ax25_ip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c index 70417e9b932d..314bbc8010fb 100644 --- a/net/ax25/ax25_ip.c +++ b/net/ax25/ax25_ip.c @@ -114,6 +114,7 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff *skb) dst = (ax25_address *)(bp + 1); src = (ax25_address *)(bp + 8); + ax25_route_lock_use(); route = ax25_get_route(dst, NULL); if (route) { digipeat = route->digipeat; @@ -206,9 +207,8 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff *skb) ax25_queue_xmit(skb, dev); put: - if (route) - ax25_put_route(route); + ax25_route_lock_unuse(); return NETDEV_TX_OK; } |