From: Jes Sorensen Date: Wed, 21 May 2014 07:37:53 +0000 (+0200) Subject: staging: rtl8723au: ioctl_cfg80211.c: Rip out < 3.14 kernel support X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=14423cd7024a99d6fa0a6ac875d03e6b0fa3cff6;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8723au: ioctl_cfg80211.c: Rip out < 3.14 kernel support Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index 5ef72b2aa9a1..b8f012cc13ef 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -3185,15 +3185,7 @@ exit: } static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) - struct ieee80211_channel *chan, - bool offchan, - unsigned int wait, - const u8 *buf, size_t len, - bool no_cck, bool dont_wait_for_ack, -#else struct cfg80211_mgmt_tx_params *params, -#endif u64 *cookie) { struct rtw_adapter *padapter = @@ -3205,11 +3197,9 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, bool ack = true; u8 category, action; unsigned long start = jiffies; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) size_t len = params->len; struct ieee80211_channel *chan = params->chan; const u8 *buf = params->buf; -#endif struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)buf; u8 tx_ch = (u8) ieee80211_frequency_to_channel(chan->center_freq);