diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 13:15:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 13:47:38 -0800 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /net/x25 | |
| parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
| download | linux-rpi3-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.gz linux-rpi3-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.bz2 linux-rpi3-fe6c791570efe717946ea7b7dd50aec96b70d551.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/x25_link.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c index 4c81f6abb65b..4cbc942f762a 100644 --- a/net/x25/x25_link.c +++ b/net/x25/x25_link.c @@ -398,6 +398,7 @@ void __exit x25_link_free(void) list_for_each_safe(entry, tmp, &x25_neigh_list) { nb = list_entry(entry, struct x25_neigh, node); __x25_remove_neigh(nb); + dev_put(nb->dev); } write_unlock_bh(&x25_neigh_list_lock); } |