From: David S. Miller <davem@davemloft.net>
Date: Fri, 7 Nov 2008 06:43:03 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9eeda9abd1faf489f3df9a1f557975f4c8650363;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c
---

9eeda9abd1faf489f3df9a1f557975f4c8650363
diff --cc drivers/net/wireless/ath5k/base.c
index 7ac5f2847da5,cfd4d052d666..6f368e8cdf17
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@@ -2949,14 -2942,13 +2949,16 @@@ static void ath5k_configure_filter(stru
  		sc->opmode != NL80211_IFTYPE_MESH_POINT &&
  		test_bit(ATH_STAT_PROMISC, sc->status))
  		rfilt |= AR5K_RX_FILTER_PROM;
- 	if (sc->opmode == NL80211_IFTYPE_ADHOC)
+ 	if (sc->opmode == NL80211_IFTYPE_STATION ||
+ 		sc->opmode == NL80211_IFTYPE_ADHOC) {
  		rfilt |= AR5K_RX_FILTER_BEACON;
+ 	}
 +	if (sc->opmode == NL80211_IFTYPE_MESH_POINT)
 +		rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON |
 +			AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
  
  	/* Set filters */
 -	ath5k_hw_set_rx_filter(ah,rfilt);
 +	ath5k_hw_set_rx_filter(ah, rfilt);
  
  	/* Set multicast bits */
  	ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]);
diff --cc net/8021q/vlan_core.c
index 118adef476c3,68ced4bf158c..dd86a1dc4cd0
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@@ -15,18 -24,32 +24,30 @@@ int __vlan_hwaccel_rx(struct sk_buff *s
  	}
  
  	skb->vlan_tci = vlan_tci;
+ 	cb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
+ 
+ 	return (polling ? netif_receive_skb(skb) : netif_rx(skb));
+ }
+ EXPORT_SYMBOL(__vlan_hwaccel_rx);
+ 
+ int vlan_hwaccel_do_receive(struct sk_buff *skb)
+ {
+ 	struct vlan_hwaccel_cb *cb = vlan_hwaccel_cb(skb);
+ 	struct net_device *dev = cb->dev;
+ 	struct net_device_stats *stats;
+ 
  	netif_nit_deliver(skb);
  
- 	skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
- 	if (skb->dev == NULL) {
- 		dev_kfree_skb_any(skb);
- 		/* Not NET_RX_DROP, this is not being dropped
- 		 * due to congestion. */
- 		return NET_RX_SUCCESS;
+ 	if (dev == NULL) {
+ 		kfree_skb(skb);
+ 		return -1;
  	}
+ 
+ 	skb->dev = dev;
+ 	skb->priority = vlan_get_ingress_priority(dev, skb->vlan_tci);
  	skb->vlan_tci = 0;
  
- 	stats = &skb->dev->stats;
 -	dev->last_rx = jiffies;
 -
+ 	stats = &dev->stats;
  	stats->rx_packets++;
  	stats->rx_bytes += skb->len;
  
diff --cc net/ipv4/udp.c
index 7e4d9c871153,cf02701ced48..54badc9a019d
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@@ -1122,16 -1072,15 +1123,16 @@@ drop
  static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
  				    struct udphdr  *uh,
  				    __be32 saddr, __be32 daddr,
 -				    struct hlist_head udptable[])
 +				    struct udp_table *udptable)
  {
  	struct sock *sk;
 +	struct udp_hslot *hslot = &udptable->hash[udp_hashfn(net, ntohs(uh->dest))];
  	int dif;
  
 -	read_lock(&udp_hash_lock);
 -	sk = sk_head(&udptable[udp_hashfn(net, ntohs(uh->dest))]);
 +	spin_lock(&hslot->lock);
 +	sk = sk_head(&hslot->head);
  	dif = skb->dev->ifindex;
- 	sk = udp_v4_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);
+ 	sk = udp_v4_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif);
  	if (sk) {
  		struct sock *sknext = NULL;
  
diff --cc net/ipv6/udp.c
index 32d914db6c4f,8b48512ebf6a..8dafa36b1ba5
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@@ -405,13 -392,12 +419,13 @@@ static int __udp6_lib_mcast_deliver(str
  {
  	struct sock *sk, *sk2;
  	const struct udphdr *uh = udp_hdr(skb);
 +	struct udp_hslot *hslot = &udptable->hash[udp_hashfn(net, ntohs(uh->dest))];
  	int dif;
  
 -	read_lock(&udp_hash_lock);
 -	sk = sk_head(&udptable[udp_hashfn(net, ntohs(uh->dest))]);
 +	spin_lock(&hslot->lock);
 +	sk = sk_head(&hslot->head);
  	dif = inet6_iif(skb);
- 	sk = udp_v6_mcast_next(sk, uh->dest, daddr, uh->source, saddr, dif);
+ 	sk = udp_v6_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif);
  	if (!sk) {
  		kfree_skb(skb);
  		goto out;