Applied assortment of Arch Linux ARM patches
This commit is contained in:
@@ -537,21 +537,6 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
|
||||
goto err_add_intf;
|
||||
}
|
||||
|
||||
/* Create AP interface by default */
|
||||
if (!mwifiex_add_virtual_intf(adapter->wiphy, "uap%d",
|
||||
NL80211_IFTYPE_AP, NULL, NULL)) {
|
||||
mwifiex_dbg(adapter, ERROR,
|
||||
"cannot create default AP interface\n");
|
||||
goto err_add_intf;
|
||||
}
|
||||
|
||||
/* Create P2P interface by default */
|
||||
if (!mwifiex_add_virtual_intf(adapter->wiphy, "p2p%d",
|
||||
NL80211_IFTYPE_P2P_CLIENT, NULL, NULL)) {
|
||||
mwifiex_dbg(adapter, ERROR,
|
||||
"cannot create default P2P interface\n");
|
||||
goto err_add_intf;
|
||||
}
|
||||
rtnl_unlock();
|
||||
|
||||
mwifiex_drv_get_driver_version(adapter, fmt, sizeof(fmt) - 1);
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
#include "main.h"
|
||||
|
||||
#define SD8786_DEFAULT_FW_NAME "mrvl/sd8786_uapsta.bin"
|
||||
#define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
|
||||
#define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"
|
||||
#define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin"
|
||||
#define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta_cros.bin"
|
||||
#define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta_cros.bin"
|
||||
#define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta_cros.bin"
|
||||
|
||||
#define BLOCK_MODE 1
|
||||
#define BYTE_MODE 0
|
||||
|
||||
@@ -309,7 +309,6 @@ static void zd1201_usbrx(struct urb *urb)
|
||||
if (data[urb->actual_length-1] == ZD1201_PACKET_RXDATA) {
|
||||
int datalen = urb->actual_length-1;
|
||||
unsigned short len, fc, seq;
|
||||
struct hlist_node *node;
|
||||
|
||||
len = ntohs(*(__be16 *)&data[datalen-2]);
|
||||
if (len>datalen)
|
||||
@@ -362,7 +361,7 @@ static void zd1201_usbrx(struct urb *urb)
|
||||
hlist_add_head(&frag->fnode, &zd->fraglist);
|
||||
goto resubmit;
|
||||
}
|
||||
hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
|
||||
hlist_for_each_entry(frag, &zd->fraglist, fnode)
|
||||
if (frag->seq == (seq&IEEE80211_SCTL_SEQ))
|
||||
break;
|
||||
if (!frag)
|
||||
@@ -1831,14 +1830,14 @@ err_zd:
|
||||
static void zd1201_disconnect(struct usb_interface *interface)
|
||||
{
|
||||
struct zd1201 *zd = usb_get_intfdata(interface);
|
||||
struct hlist_node *node, *node2;
|
||||
struct hlist_node *node2;
|
||||
struct zd1201_frag *frag;
|
||||
|
||||
if (!zd)
|
||||
return;
|
||||
usb_set_intfdata(interface, NULL);
|
||||
|
||||
hlist_for_each_entry_safe(frag, node, node2, &zd->fraglist, fnode) {
|
||||
hlist_for_each_entry_safe(frag, node2, &zd->fraglist, fnode) {
|
||||
hlist_del_init(&frag->fnode);
|
||||
kfree_skb(frag->skb);
|
||||
kfree(frag);
|
||||
|
||||
Reference in New Issue
Block a user