diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-24 02:58:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-24 02:58:51 -0700 |
| commit | 3a07bd6fead4f00f67b1bf5f551e686661c4f52c (patch) | |
| tree | f8b8f257d928a9ae1aeb3fdbe748f03f1012f02e /net/rose | |
| parent | 204621551b2a0060a013b92f7add4d5c452fa7cb (diff) | |
| parent | f1590670ce069eefeb93916391a67643e6ad1630 (diff) | |
| download | linux-3a07bd6fead4f00f67b1bf5f551e686661c4f52c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mellanox/mlx4/main.c
net/packet/af_packet.c
Both conflicts were cases of simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 36dbc2da3661..129d357d2722 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -192,7 +192,8 @@ static void rose_kill_by_device(struct net_device *dev) if (rose->device == dev) { rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0); - rose->neighbour->use--; + if (rose->neighbour) + rose->neighbour->use--; rose->device = NULL; } } |