bbs.cooldavid.org Git - net-next-2.6.git/commit - drivers/staging/rtl8192su/r8192U

]> bbs.cooldavid.org Git - net-next-2.6.git/commit - drivers/staging/rtl8192su/r8192U_core.c

git://bbs.cooldavid.org / net-next-2.6.git / commit

author	Frederic Leroy <fredo@starox.org>
	Wed, 17 Feb 2010 23:25:26 +0000 (00:25 +0100)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 19 Feb 2010 20:52:41 +0000 (15:52 -0500)
commit	e2117cea27c6b27e1a379acac5eb0433eeb7033a
tree	36371bf349577840c6fa796bca671c12316e68f1	tree \| snapshot (tar.bz2 tar.gz zip)
parent	5b9a919a97ac8bdda8020c9b366491b5b91b196e	commit \| diff

staging: rtl8192su: fix compile error from wireless-testing commit

In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr
to include/linux/ieee80211.h. This definition collides with one that is
in the rtl8192su driver in staging.

The conflict is resolved by changing rtl8192su
to use the definition from include/linux/ieee80211.h.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

Clone of davem's net-next-2.6 tree

RSS Atom

drivers/staging/rtl8192su/ieee80211/ieee80211.h		diff \| blob \| blame \| history
drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h		diff \| blob \| blame \| history
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c		diff \| blob \| blame \| history
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c		diff \| blob \| blame \| history
drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c		diff \| blob \| blame \| history
drivers/staging/rtl8192su/r8192U_core.c		diff \| blob \| blame \| history