From b385ef01cfd8385071ccbd60250af7910e635ad6 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 24 Mar 2009 18:34:26 -0700 Subject: [PATCH] Update compat.diff Signed-off-by: Luis R. Rodriguez --- compat/compat.diff | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compat/compat.diff b/compat/compat.diff index d80aba961d89..1b6bc1282384 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -271,9 +271,9 @@ index a0c860f..9c6f214 100644 dev->irq = sdev->irq; SET_ETHTOOL_OPS(dev, &b44_ethtool_ops); ---- a/net/mac80211/iface.c 2009-03-20 19:55:10.000000000 -0700 -+++ b/net/mac80211/iface.c 2009-03-20 19:55:18.000000000 -0700 -@@ -669,6 +669,7 @@ +--- a/net/mac80211/iface.c 2009-03-24 18:33:11.000000000 -0700 ++++ b/net/mac80211/iface.c 2009-03-24 18:33:18.000000000 -0700 +@@ -671,6 +671,7 @@ WARN_ON(flushed); } @@ -281,7 +281,7 @@ index a0c860f..9c6f214 100644 static const struct net_device_ops ieee80211_dataif_ops = { .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, -@@ -688,11 +689,22 @@ +@@ -690,11 +691,22 @@ .ndo_change_mtu = ieee80211_change_mtu, .ndo_set_mac_address = eth_mac_addr, }; @@ -304,7 +304,7 @@ index a0c860f..9c6f214 100644 dev->wireless_handlers = &ieee80211_iw_handler_def; dev->destructor = free_netdev; } -@@ -708,7 +720,11 @@ +@@ -710,7 +722,11 @@ /* and set some type-dependent values */ sdata->vif.type = type; @@ -316,7 +316,7 @@ index a0c860f..9c6f214 100644 sdata->wdev.iftype = type; /* only monitor differs */ -@@ -731,7 +747,11 @@ +@@ -733,7 +749,11 @@ break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -328,7 +328,7 @@ index a0c860f..9c6f214 100644 sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; break; -@@ -838,6 +858,10 @@ +@@ -840,6 +860,10 @@ if (ret) goto fail; -- 2.30.2