summaryrefslogtreecommitdiff
path: root/patches/0079-netdev-destructor
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-03-04 23:57:04 +0100
committerJohannes Berg <johannes.berg@intel.com>2018-03-21 09:19:32 +0100
commit9436e5946ad610081f5564f6e1fb233f62698060 (patch)
tree5aa8a63fac6d5bbd0dd35c7843fb7041faf19eb5 /patches/0079-netdev-destructor
parent50234c8b91ff22528b41668d674517009073f698 (diff)
patches: refresh on kernel v4.16-rc3
No manual changes needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0079-netdev-destructor')
-rw-r--r--patches/0079-netdev-destructor/brcmfmac.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0079-netdev-destructor/brcmfmac.patch b/patches/0079-netdev-destructor/brcmfmac.patch
index 6dae7a7a..298c4417 100644
--- a/patches/0079-netdev-destructor/brcmfmac.patch
+++ b/patches/0079-netdev-destructor/brcmfmac.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -462,6 +462,23 @@ static const struct net_device_ops brcmf
+@@ -500,6 +500,23 @@ static const struct net_device_ops brcmf
.ndo_set_rx_mode = brcmf_netdev_set_multicast_list
};
@@ -24,7 +24,7 @@
int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
{
struct brcmf_pub *drvr = ifp->drvr;
-@@ -634,7 +651,11 @@ struct brcmf_if *brcmf_add_if(struct brc
+@@ -672,7 +689,11 @@ struct brcmf_if *brcmf_add_if(struct brc
if (!ndev)
return ERR_PTR(-ENOMEM);