From 772c018cfa94f8ff4848090d5cbb05b809787350 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 17 Mar 2009 23:01:53 +0100 Subject: [PATCH] Remove patch for net/wireless/nl80211.c this was reverted in wireless-testing. Signed-off-by: Hauke Mehrtens --- compat/compat.diff | 411 --------------------------------------------- 1 file changed, 411 deletions(-) diff --git a/compat/compat.diff b/compat/compat.diff index bc1363e95a04..e723fc8ae32c 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -410,414 +410,3 @@ index a0c860f..9c6f214 100644 return ops; } ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -641,15 +641,17 @@ - if (!err) - flags = &_flags; - } -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); -+#endif - err = drv->ops->change_virtual_intf(&drv->wiphy, ifindex, - type, flags, ¶ms); - - dev = __dev_get_by_index(&init_net, ifindex); - WARN_ON(!dev || (!err && dev->ieee80211_ptr->iftype != type)); -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_unlock(); -- -+#endif - unlock: - cfg80211_put_dev(drv); - return err; -@@ -689,16 +691,18 @@ - params.mesh_id = nla_data(info->attrs[NL80211_ATTR_MESH_ID]); - params.mesh_id_len = nla_len(info->attrs[NL80211_ATTR_MESH_ID]); - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); -+#endif - err = parse_monitor_flags(type == NL80211_IFTYPE_MONITOR ? - info->attrs[NL80211_ATTR_MNTR_FLAGS] : NULL, - &flags); - err = drv->ops->add_virtual_intf(&drv->wiphy, - nla_data(info->attrs[NL80211_ATTR_IFNAME]), - type, err ? NULL : &flags, ¶ms); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_unlock(); -- -+#endif - - unlock: - cfg80211_put_dev(drv); -@@ -721,11 +725,13 @@ - err = -EOPNOTSUPP; - goto out; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->del_virtual_intf(&drv->wiphy, ifindex); - rtnl_unlock(); -- -+#else -+ err = drv->ops->del_virtual_intf(&drv->wiphy, ifindex); -+#endif - out: - cfg80211_put_dev(drv); - return err; -@@ -809,11 +815,15 @@ - if (mac_addr) - NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, mac_addr); - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->get_key(&drv->wiphy, dev, key_idx, mac_addr, - &cookie, get_key_callback); - rtnl_unlock(); -- -+#else -+ err = drv->ops->get_key(&drv->wiphy, dev, key_idx, mac_addr, -+ &cookie, get_key_callback); -+#endif - if (err) - goto out; - -@@ -871,11 +881,13 @@ - err = -EOPNOTSUPP; - goto out; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = func(&drv->wiphy, dev, key_idx); - rtnl_unlock(); -- -+#else -+ err = func(&drv->wiphy, dev, key_idx); -+#endif - out: - cfg80211_put_dev(drv); - dev_put(dev); -@@ -956,10 +968,13 @@ - err = -EOPNOTSUPP; - goto out; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->add_key(&drv->wiphy, dev, key_idx, mac_addr, ¶ms); - rtnl_unlock(); -+#else -+ err = drv->ops->add_key(&drv->wiphy, dev, key_idx, mac_addr, ¶ms); -+#endif - - out: - cfg80211_put_dev(drv); -@@ -992,10 +1007,13 @@ - err = -EOPNOTSUPP; - goto out; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->del_key(&drv->wiphy, dev, key_idx, mac_addr); - rtnl_unlock(); -+#else -+ err = drv->ops->del_key(&drv->wiphy, dev, key_idx, mac_addr); -+#endif - - out: - cfg80211_put_dev(drv); -@@ -1075,11 +1093,13 @@ - err = -EINVAL; - goto out; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = call(&drv->wiphy, dev, ¶ms); - rtnl_unlock(); -- -+#else -+ err = call(&drv->wiphy, dev, ¶ms); -+#endif - out: - cfg80211_put_dev(drv); - dev_put(dev); -@@ -1100,11 +1120,13 @@ - err = -EOPNOTSUPP; - goto out; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->del_beacon(&drv->wiphy, dev); - rtnl_unlock(); -- -+#else -+ err = drv->ops->del_beacon(&drv->wiphy, dev); -+#endif - out: - cfg80211_put_dev(drv); - dev_put(dev); -@@ -1287,16 +1309,20 @@ - err = -ENOSYS; - goto out_err; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); -- -+#endif - while (1) { - err = dev->ops->dump_station(&dev->wiphy, netdev, sta_idx, - mac_addr, &sinfo); - if (err == -ENOENT) - break; - if (err) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - goto out_err_rtnl; -+#else -+ goto out_err; -+#endif - - if (nl80211_send_station(skb, - NETLINK_CB(cb->skb).pid, -@@ -1312,8 +1338,10 @@ - out: - cb->args[1] = sta_idx; - err = skb->len; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - out_err_rtnl: - rtnl_unlock(); -+#endif - out_err: - cfg80211_put_dev(dev); - out_put_netdev: -@@ -1347,9 +1375,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->get_station(&drv->wiphy, dev, mac_addr, &sinfo); - rtnl_unlock(); -+#else -+ err = drv->ops->get_station(&drv->wiphy, dev, mac_addr, &sinfo); -+#endif - - if (err) - goto out; -@@ -1451,9 +1483,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->change_station(&drv->wiphy, dev, mac_addr, ¶ms); - rtnl_unlock(); -+#else -+ err = drv->ops->change_station(&drv->wiphy, dev, mac_addr, ¶ms); -+#endif - - out: - if (params.vlan) -@@ -1514,9 +1550,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->add_station(&drv->wiphy, dev, mac_addr, ¶ms); - rtnl_unlock(); -+#else -+ err = drv->ops->add_station(&drv->wiphy, dev, mac_addr, ¶ms); -+#endif - - out: - if (params.vlan) -@@ -1545,9 +1585,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->del_station(&drv->wiphy, dev, mac_addr); - rtnl_unlock(); -+#else -+ err = drv->ops->del_station(&drv->wiphy, dev, mac_addr); -+#endif - - out: - cfg80211_put_dev(drv); -@@ -1647,7 +1691,9 @@ - goto out_err; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); -+#endif - - while (1) { - err = dev->ops->dump_mpath(&dev->wiphy, netdev, path_idx, -@@ -1655,7 +1701,11 @@ - if (err == -ENOENT) - break; - if (err) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - goto out_err_rtnl; -+#else -+ goto out_err; -+#endif - - if (nl80211_send_mpath(skb, NETLINK_CB(cb->skb).pid, - cb->nlh->nlmsg_seq, NLM_F_MULTI, -@@ -1670,8 +1720,10 @@ - out: - cb->args[1] = path_idx; - err = skb->len; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - out_err_rtnl: - rtnl_unlock(); -+#endif - out_err: - cfg80211_put_dev(dev); - out_put_netdev: -@@ -1706,9 +1758,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->get_mpath(&drv->wiphy, dev, dst, next_hop, &pinfo); - rtnl_unlock(); -+#else -+ err = drv->ops->get_mpath(&drv->wiphy, dev, dst, next_hop, &pinfo); -+#endif - - if (err) - goto out; -@@ -1759,9 +1815,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->change_mpath(&drv->wiphy, dev, dst, next_hop); - rtnl_unlock(); -+#else -+ err = drv->ops->change_mpath(&drv->wiphy, dev, dst, next_hop); -+#endif - - out: - cfg80211_put_dev(drv); -@@ -1794,9 +1854,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->add_mpath(&drv->wiphy, dev, dst, next_hop); - rtnl_unlock(); -+#else -+ err = drv->ops->add_mpath(&drv->wiphy, dev, dst, next_hop); -+#endif - - out: - cfg80211_put_dev(drv); -@@ -1823,9 +1887,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->del_mpath(&drv->wiphy, dev, dst); - rtnl_unlock(); -+#else -+ err = drv->ops->del_mpath(&drv->wiphy, dev, dst); -+#endif - - out: - cfg80211_put_dev(drv); -@@ -1871,9 +1939,13 @@ - goto out; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->change_bss(&drv->wiphy, dev, ¶ms); - rtnl_unlock(); -+#else -+ err = drv->ops->change_bss(&drv->wiphy, dev, ¶ms); -+#endif - - out: - cfg80211_put_dev(drv); -@@ -1978,9 +2050,13 @@ - return err; - - /* Get the mesh params */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->get_mesh_params(&drv->wiphy, dev, &cur_params); - rtnl_unlock(); -+#else -+ err = drv->ops->get_mesh_params(&drv->wiphy, dev, &cur_params); -+#endif - if (err) - goto out; - -@@ -2126,9 +2202,13 @@ - nla_get_u16); - - /* Apply changes */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->set_mesh_params(&drv->wiphy, dev, &cfg, mask); - rtnl_unlock(); -+#else -+ err = drv->ops->set_mesh_params(&drv->wiphy, dev, &cfg, mask); -+#endif - - /* cleanup */ - cfg80211_put_dev(drv); -@@ -2304,9 +2384,13 @@ - return err; - - if (drv->ops->set_mgmt_extra_ie) { -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); - err = drv->ops->set_mgmt_extra_ie(&drv->wiphy, dev, ¶ms); - rtnl_unlock(); -+#else -+ err = drv->ops->set_mgmt_extra_ie(&drv->wiphy, dev, ¶ms); -+#endif - } else - err = -EOPNOTSUPP; - -@@ -2338,9 +2422,9 @@ - err = -EOPNOTSUPP; - goto out; - } -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_lock(); -- -+#endif - if (drv->scan_req) { - err = -EBUSY; - goto out_unlock; -@@ -2451,7 +2535,9 @@ - kfree(request); - } - out_unlock: -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - rtnl_unlock(); -+#endif - out: - cfg80211_put_dev(drv); - dev_put(dev); -- 2.30.2