diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 11:05:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 11:05:57 +1000 |
| commit | dacbb9cadc0f0795e59ed09f6ef9b26ca46d1e0f (patch) | |
| tree | 4b2e70b7f229714972f1a4fc4cc0eab4912b7def | |
| parent | a5ec7cb1d82471f77c3fe3cab62a84312f265647 (diff) | |
| parent | cc1380dd188204ada05936b034e93dbca9b5f06a (diff) | |
| download | linux-next-history-dacbb9cadc0f0795e59ed09f6ef9b26ca46d1e0f.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 6 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c index 0ccf735316c24d..9a105e6debe1f5 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c @@ -117,13 +117,6 @@ struct bootrom_id_le { __le32 boardrev; /* Board revision */ }; -struct brcmf_usb_image { - struct list_head list; - s8 *fwname; - u8 *image; - int image_len; -}; - struct brcmf_usbdev_info { struct brcmf_usbdev bus_pub; /* MUST BE FIRST */ spinlock_t qlock; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c index e859075db716bb..c3376f887114a4 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c @@ -143,12 +143,6 @@ struct ampdu_info { struct brcms_fifo_info fifo_tb[NUM_FFPLD_FIFO]; }; -/* used for flushing ampdu packets */ -struct cb_del_ampdu_pars { - struct ieee80211_sta *sta; - u16 tid; -}; - static void brcms_c_scb_ampdu_update_max_txlen(struct ampdu_info *ampdu, u8 dur) { u32 rate, mcs; |