Staging: fix rtl8187se compilation errors with mac80211

This patch fixes compilation problems that were caused by function
naming conflicts between the rtl8187se driver and the mac80211 stack.

Signed-off-by: George Kadianakis <desnacked at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/staging/rtl8187se/ieee80211/ieee80211.h
Simple merge

diff --cc drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
Simple merge

diff --cc drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
Simple merge

diff --cc drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
Simple merge

diff --cc drivers/staging/rtl8187se/r8180_core.c
Simple merge

diff --cc drivers/staging/rtl8187se/r8180_wx.c
Simple merge