Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56

Browse source

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

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

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

...

This commit is contained in:

Larry Finger 2010-01-14 13:13:47 -06:00 • committed by John W. Linville

parent a0f2e0fca1

commit b6b1ac6937

3 changed files with 14 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/staging/rtl8187se/ieee80211/ieee80211.h

View file

24

drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c

View file

4

drivers/staging/rtl8187se/r8180_core.c

View file