]> bbs.cooldavid.org Git - net-next-2.6.git/commit
ipw2x00: remove the right /proc/net entry
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Nov 2010 01:57:04 +0000 (18:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Nov 2010 01:57:04 +0000 (18:57 -0700)
commit151f52f09c5728ecfdd0c289da1a4b30bb416f2c
tree8e08b77ef0a0c7825673cf77b7601c659e9c104c
parentd4285bd6be60268ee9925b41287fb8c2a3132bde
ipw2x00: remove the right /proc/net entry

Commit 27ae60f8f7aa ("ipw2x00: replace "ieee80211" with "libipw" where
appropriate") changed DRV_NAME to be "libipw", but didn't properly fix
up the places where it was used to specify the name for the /proc/net/
directory.

For backwards compatibility reasons, that directory name remained
"ieee80211", but due to the DRV_NAME change, the error case printouts
and the cleanup functions now used "libipw" instead.  Which made it all
fail badly.

For example, on module unload as reported by Randy:

  WARNING: at fs/proc/generic.c:816 remove_proc_entry+0x156/0x35e()
  name 'libipw'

because it's trying to unregister a /proc directory that obviously
doesn't even exist.

Clean it all up to use DRV_PROCNAME for the actual /proc directory name.

Reported-and-tested-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Pavel Roskin <proski@gnu.org>
Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/net/wireless/ipw2x00/libipw_module.c