diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-05-20 22:07:40 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-05-20 22:07:40 -0700 |
| commit | 4fb3d3ffacf257b6c8e8ef7ae6d9cf22b97902ed (patch) | |
| tree | 789d72c24b2d02bdf2dee7addc9a7a802b19a6cf | |
| parent | 19ac8193afc08d4c4184b83c83aa2252645d94aa (diff) | |
| download | compat-wireless-2.6-old-4fb3d3ffacf257b6c8e8ef7ae6d9cf22b97902ed.tar.gz | |
Update compat.diff for new changes on libertas/ethtool.c.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
| -rw-r--r-- | compat/compat.diff | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index 1fff58a..596087e 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -235,34 +235,6 @@ LED_SCANNING = 1, LED_ASSOCIATED = 2, }; ---- a/drivers/net/wireless/libertas/ethtool.c 2008-04-03 21:51:48.000000000 -0400 -+++ b/drivers/net/wireless/libertas/ethtool.c 2008-04-03 21:51:49.000000000 -0400 -@@ -111,6 +111,7 @@ - lbs_deb_enter(LBS_DEB_ETHTOOL); - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) - static int lbs_ethtool_get_sset_count(struct net_device * dev, int sset) - { - switch (sset) { -@@ -120,6 +121,7 @@ - return -EOPNOTSUPP; - } - } -+#endif - - static void lbs_ethtool_get_strings(struct net_device *dev, - u32 stringset, -@@ -188,7 +190,9 @@ - .get_drvinfo = lbs_ethtool_get_drvinfo, - .get_eeprom = lbs_ethtool_get_eeprom, - .get_eeprom_len = lbs_ethtool_get_eeprom_len, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) - .get_sset_count = lbs_ethtool_get_sset_count, -+#endif - .get_ethtool_stats = lbs_ethtool_get_stats, - .get_strings = lbs_ethtool_get_strings, - .get_wol = lbs_ethtool_get_wol, --- a/net/mac80211/util.c 2008-04-15 19:25:05.000000000 -0700 +++ b/net/mac80211/util.c 2008-04-15 19:25:05.000000000 -0700 @@ -20,9 +20,15 @@ @@ -890,3 +862,31 @@ mdev->set_multicast_list = ieee80211_master_set_multicast_list; sdata->vif.type = IEEE80211_IF_TYPE_AP; +--- a/drivers/net/wireless/libertas/ethtool.c 2008-05-20 22:04:10.000000000 -0700 ++++ b/drivers/net/wireless/libertas/ethtool.c 2008-05-20 22:06:48.000000000 -0700 +@@ -111,6 +111,7 @@ + lbs_deb_enter(LBS_DEB_ETHTOOL); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + static int lbs_ethtool_get_sset_count(struct net_device *dev, int sset) + { + struct lbs_private *priv = dev->priv; +@@ -120,6 +121,7 @@ + + return -EOPNOTSUPP; + } ++#endif + + static void lbs_ethtool_get_strings(struct net_device *dev, + uint32_t stringset, uint8_t *s) +@@ -187,7 +189,9 @@ + .get_drvinfo = lbs_ethtool_get_drvinfo, + .get_eeprom = lbs_ethtool_get_eeprom, + .get_eeprom_len = lbs_ethtool_get_eeprom_len, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + .get_sset_count = lbs_ethtool_get_sset_count, ++#endif + .get_ethtool_stats = lbs_ethtool_get_stats, + .get_strings = lbs_ethtool_get_strings, + .get_wol = lbs_ethtool_get_wol, |