diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 10:08:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 10:08:08 -0700 |
| commit | fffdedef691a0f6fa7ca1fc0a2a508cbb49def69 (patch) | |
| tree | 124b128308a4d35bab0ac8001da4b324d40220eb /net | |
| parent | 5723ff931a94acf0738df42604ee89f852e151b0 (diff) | |
| parent | bf94e17bc8d35fc339945a42990a2f2b5e9b5a40 (diff) | |
| download | linux-fffdedef691a0f6fa7ca1fc0a2a508cbb49def69.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net/mac80211/rx.c: fix build error
acpi: Make ACPI_TOSHIBA depend on INPUT.
net/bfin_mac.c MDIO namespace fixes
jme: remove unused #include <version.h>
netfilter: remove unused #include <version.h>
net: Fix off-by-one in skb_dma_map
smc911x: Add support for LAN921{5,7,8} chips from SMSC
qlge: remove duplicated #include
wireless: remove duplicated #include
net/au1000_eth.c MDIO namespace fixes
net/tc35815.c: fix compilation
sky2: Fix WOL regression
r8169: NULL pointer dereference on r8169 load
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/skb_dma_map.c | 2 | ||||
| -rw-r--r-- | net/mac80211/rx.c | 5 | ||||
| -rw-r--r-- | net/netfilter/nf_tproxy_core.c | 1 | ||||
| -rw-r--r-- | net/wireless/core.c | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/net/core/skb_dma_map.c b/net/core/skb_dma_map.c index 1f49afcd8e86..86234923a3b7 100644 --- a/net/core/skb_dma_map.c +++ b/net/core/skb_dma_map.c @@ -35,7 +35,7 @@ int skb_dma_map(struct device *dev, struct sk_buff *skb, return 0; unwind: - while (i-- >= 0) { + while (--i >= 0) { skb_frag_t *fp = &sp->frags[i]; dma_unmap_page(dev, sp->dma_maps[i + 1], diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 77e7b014872b..cf6b121e1bbf 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1379,6 +1379,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) return RX_QUEUED; } +#ifdef CONFIG_MAC80211_MESH static ieee80211_rx_result ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) { @@ -1453,7 +1454,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) else return RX_DROP_MONITOR; } - +#endif static ieee80211_rx_result debug_noinline ieee80211_rx_h_data(struct ieee80211_rx_data *rx) @@ -1780,8 +1781,10 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata, /* must be after MMIC verify so header is counted in MPDU mic */ CALL_RXH(ieee80211_rx_h_remove_qos_control) CALL_RXH(ieee80211_rx_h_amsdu) +#ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif)) CALL_RXH(ieee80211_rx_h_mesh_fwding); +#endif CALL_RXH(ieee80211_rx_h_data) CALL_RXH(ieee80211_rx_h_ctrl) CALL_RXH(ieee80211_rx_h_action) diff --git a/net/netfilter/nf_tproxy_core.c b/net/netfilter/nf_tproxy_core.c index fe34f4bf74cc..cdc97f3105a3 100644 --- a/net/netfilter/nf_tproxy_core.c +++ b/net/netfilter/nf_tproxy_core.c @@ -10,7 +10,6 @@ * */ -#include <linux/version.h> #include <linux/module.h> #include <linux/net.h> diff --git a/net/wireless/core.c b/net/wireless/core.c index 5cadbeb76a14..24fdd4cd22cb 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -13,7 +13,6 @@ #include <linux/debugfs.h> #include <linux/notifier.h> #include <linux/device.h> -#include <linux/list.h> #include <net/genetlink.h> #include <net/cfg80211.h> #include <net/wireless.h> |