mt76_* functions conflicts with mt7601u driver what prevents to build
those drivers in the kernel or use both drivers modules at once.
Patch fixes build errors like this:
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o:(.opd+0x30): multiple definition of `mt76_mac_tx_rate_val'; drivers/net/wireless/mediatek/mt7601u/mac.o:(.opd+0x30): first defined here
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 7b4859026c
("mt76x0: core files")
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
43 lines
990 B
C
43 lines
990 B
C
/*
|
|
* Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2
|
|
* as published by the Free Software Foundation
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include "mt76x0.h"
|
|
|
|
void mt76x0_remove_hdr_pad(struct sk_buff *skb)
|
|
{
|
|
int len = ieee80211_get_hdrlen_from_skb(skb);
|
|
|
|
memmove(skb->data + 2, skb->data, len);
|
|
skb_pull(skb, 2);
|
|
}
|
|
|
|
int mt76x0_insert_hdr_pad(struct sk_buff *skb)
|
|
{
|
|
int len = ieee80211_get_hdrlen_from_skb(skb);
|
|
int ret;
|
|
|
|
if (len % 4 == 0)
|
|
return 0;
|
|
|
|
ret = skb_cow(skb, 2);
|
|
if (ret)
|
|
return ret;
|
|
|
|
skb_push(skb, 2);
|
|
memmove(skb->data, skb->data + 2, len);
|
|
|
|
skb->data[len] = 0;
|
|
skb->data[len + 1] = 0;
|
|
return 0;
|
|
}
|