This will fix the make clean problem reported by Brett D. Ussher. wl12xx will be removed from Makefile. I do not think wl12xx needs to be integrated, because it is not rely widely used. If needed it will not be very hard to integrate it. Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- compat/compat.diff | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/compat/compat.diff b/compat/compat.diff index 68bfd81..8447f84 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -180,6 +180,12 @@ obj-$(CONFIG_LIBERTAS) += libertas/ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ +@@ -58,5 +32,3 @@ obj-$(CONFIG_P54_COMMON) += p54/ + obj-$(CONFIG_ATH_COMMON) += ath/ + + obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o +- +-obj-$(CONFIG_WL12XX) += wl12xx/ --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c @@ -87,7 +87,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) @@ -231,7 +237,7 @@ priv->wireless_data.ieee80211 = priv->ieee; --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c -@@ -11529,6 +11529,7 @@ static int ipw_prom_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) +@@ -11530,6 +11530,7 @@ static int ipw_prom_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) return -EOPNOTSUPP; } @@ -239,7 +245,7 @@ static const struct net_device_ops ipw_prom_netdev_ops = { .ndo_open = ipw_prom_open, .ndo_stop = ipw_prom_stop, -@@ -11537,6 +11538,7 @@ static const struct net_device_ops ipw_prom_netdev_ops = { +@@ -11538,6 +11539,7 @@ static const struct net_device_ops ipw_prom_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -247,7 +253,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv) { -@@ -11557,7 +11559,13 @@ static int ipw_prom_alloc(struct ipw_priv *priv) +@@ -11558,7 +11560,13 @@ static int ipw_prom_alloc(struct ipw_priv *priv) memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN); priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -261,7 +267,7 @@ priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev); -@@ -11585,6 +11593,7 @@ static void ipw_prom_free(struct ipw_priv *priv) +@@ -11586,6 +11594,7 @@ static void ipw_prom_free(struct ipw_priv *priv) #endif @@ -269,7 +275,7 @@ static const struct net_device_ops ipw_netdev_ops = { .ndo_init = ipw_net_init, .ndo_open = ipw_net_open, -@@ -11595,6 +11604,7 @@ static const struct net_device_ops ipw_netdev_ops = { +@@ -11596,6 +11605,7 @@ static const struct net_device_ops ipw_netdev_ops = { .ndo_change_mtu = ieee80211_change_mtu, .ndo_validate_addr = eth_validate_addr, }; @@ -277,7 +283,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) -@@ -11696,7 +11706,15 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, +@@ -11697,7 +11707,15 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; @@ -404,7 +410,7 @@ --- a/drivers/net/wireless/mac80211_hwsim.c 2009-04-28 15:35:05.000000000 -0700 +++ b/drivers/net/wireless/mac80211_hwsim.c 2009-04-28 15:35:06.000000000 -0700 -@@ -732,16 +732,22 @@ +@@ -734,16 +734,22 @@ .name = "mac80211_hwsim" }; @@ -469,7 +475,7 @@ /* --- a/net/mac80211/iface.c 2009-04-28 15:34:50.000000000 -0700 +++ b/net/mac80211/iface.c 2009-04-28 15:35:06.000000000 -0700 -@@ -667,6 +667,7 @@ +@@ -671,6 +671,7 @@ WARN_ON(flushed); } @@ -477,7 +483,7 @@ static const struct net_device_ops ieee80211_dataif_ops = { .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, -@@ -686,11 +687,22 @@ +@@ -690,11 +691,22 @@ .ndo_change_mtu = ieee80211_change_mtu, .ndo_set_mac_address = eth_mac_addr, }; @@ -500,7 +506,7 @@ dev->wireless_handlers = &ieee80211_iw_handler_def; dev->destructor = free_netdev; } -@@ -706,7 +718,11 @@ +@@ -710,7 +722,11 @@ /* and set some type-dependent values */ sdata->vif.type = type; @@ -512,7 +518,7 @@ sdata->wdev.iftype = type; /* only monitor differs */ -@@ -729,7 +745,11 @@ +@@ -733,7 +749,11 @@ break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -524,7 +530,7 @@ sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; break; -@@ -836,6 +856,10 @@ +@@ -840,6 +860,10 @@ if (ret) goto fail; @@ -553,7 +559,7 @@ #ifdef CONFIG_MAC80211_VERBOSE_DEBUG if (net_ratelimit()) -@@ -805,6 +807,7 @@ +@@ -806,6 +808,7 @@ } EXPORT_SYMBOL(ieee80211_alloc_hw); @@ -561,7 +567,7 @@ static const struct net_device_ops ieee80211_master_ops = { .ndo_start_xmit = ieee80211_master_start_xmit, .ndo_open = ieee80211_master_open, -@@ -812,12 +815,22 @@ +@@ -813,12 +816,22 @@ .ndo_set_multicast_list = ieee80211_master_set_multicast_list, .ndo_select_queue = ieee80211_select_queue, }; @@ -725,7 +731,7 @@ /* overwrite IEs */ if (overwrite) { -@@ -397,6 +412,7 @@ +@@ -398,6 +413,7 @@ } } -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html