diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-08 22:15:38 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-08 22:47:38 +0100 |
commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /net/x25/x25_link.c | |
parent | isdn/hisax: fix compiler warning on hisax_pci_tbl (diff) | |
parent | tcp: protect sysctl_tcp_cookie_size reads (diff) | |
download | linux-fe6c791570efe717946ea7b7dd50aec96b70d551.tar.xz linux-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/x25_link.c')
-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); } |