summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0001-netdev_ops.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/0001-netdev_ops.patch')
-rw-r--r--patches/collateral-evolutions/network/0001-netdev_ops.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch
index 27a47e20..8e788edc 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch
@@ -104,7 +104,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
dev->irq = sdev->irq;
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6100,7 +6100,7 @@ static struct net_device *ipw2100_alloc_
+@@ -6086,7 +6086,7 @@ static struct net_device *ipw2100_alloc_
priv->ieee->perfect_rssi = -20;
priv->ieee->worst_rssi = -85;
@@ -115,7 +115,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
priv->wireless_data.libipw = priv->ieee;
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11687,7 +11687,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11680,7 +11680,7 @@ static int ipw_prom_alloc(struct ipw_pri
memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -124,7 +124,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11825,7 +11825,7 @@ static int ipw_pci_probe(struct pci_dev
+@@ -11818,7 +11818,7 @@ static int ipw_pci_probe(struct pci_dev
priv->ieee->perfect_rssi = -20;
priv->ieee->worst_rssi = -85;
@@ -234,7 +234,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1047,7 +1047,7 @@ static void ieee80211_if_setup(struct ne
+@@ -977,7 +977,7 @@ static void ieee80211_if_setup(struct ne
{
ether_setup(dev);
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -243,7 +243,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
dev->destructor = free_netdev;
}
-@@ -1210,7 +1210,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1140,7 +1140,7 @@ static void ieee80211_setup_sdata(struct
/* only monitor/p2p-device differ */
if (sdata->dev) {
@@ -252,7 +252,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
sdata->dev->type = ARPHRD_ETHER;
}
-@@ -1248,7 +1248,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1178,7 +1178,7 @@ static void ieee80211_setup_sdata(struct
break;
case NL80211_IFTYPE_MONITOR:
sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;