Commit 90768c09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  [NETNS][IPV6] tcp - assign the netns for timewait sockets
  [IPV4]: Fix byte value boundary check in do_ip_getsockopt().
  BNX2X: Correct bringing chip out of reset
  [NETFILTER]: nf_nat: autoload IPv4 connection tracking
  [NETFILTER]: xt_hashlimit: fix mask calculation
  [XFRM]: xfrm_user: fix selector family initialization
  rt61pci: rt61pci_beacon_update do not free skb twice
  ssb-mipscore: Fix interrupt vectors
  ssb-pcicore: Fix IRQ TPS flag handling
  mac80211: use short_preamble mode from capability if ERP IE not present
  [NET]: Undo code bloat in hot paths due to print_mac().
  [TCP]: Don't allow FRTO to take place while MTU is being probed
  [TCP]: tcp_simple_retransmit can cause S+L
  [TCP]: Fix NewReno's fast rexmit/recovery problems with GSOed skb
  [TCP]: Restore 2.6.24 mark_head_lost behavior for newreno/fack
  nl80211: fix STA AID bug
  b43legacy: fix bcm4303 crash
  iwlwifi: fix n-band association problem
  ipw2200: set MAC address on radiotap interface
  libertas: fix mode initialization problem
parents 3f063501 7951f0b0

drivers/net/bnx2x.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -63,8 +63,8 @@ 
#include "bnx2x.h"

#include "bnx2x.h"

#include "bnx2x_init.h"

#include "bnx2x_init.h"





#define DRV_MODULE_VERSION      "1.42.3"

#define DRV_MODULE_VERSION      "1.42.4"

#define DRV_MODULE_RELDATE      "2008/3/9"

#define DRV_MODULE_RELDATE      "2008/4/9"

#define BNX2X_BC_VER    	0x040200

#define BNX2X_BC_VER    	0x040200





/* Time in jiffies before concluding the transmitter is hung. */

/* Time in jiffies before concluding the transmitter is hung. */
@@ -6153,7 +6153,7 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode) 
		   func, mode);

		   func, mode);

		REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,

		REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,

		       0xffffffff);

		       0xffffffff);

		REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,

		REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,

		       0xfffc);

		       0xfffc);

		bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END);

		bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END);

drivers/net/starfire.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -1472,13 +1472,12 @@ static int __netdev_rx(struct net_device *dev, int *quota) 
#ifndef final_version			/* Remove after testing. */

#ifndef final_version			/* Remove after testing. */

		/* You will want this info for the initial debug. */

		/* You will want this info for the initial debug. */

		if (debug > 5) {

		if (debug > 5) {

			DECLARE_MAC_BUF(mac);

			printk(KERN_DEBUG "  Rx data " MAC_FMT " " MAC_FMT

			DECLARE_MAC_BUF(mac2);



			printk(KERN_DEBUG "  Rx data %s %s"

			       " %2.2x%2.2x.\n",

			       " %2.2x%2.2x.\n",

			       print_mac(mac, &skb->data[0]),

			       skb->data[0], skb->data[1], skb->data[2],

			       print_mac(mac2, &skb->data[6]),

			       skb->data[3], skb->data[4], skb->data[5],

			       skb->data[6], skb->data[7], skb->data[8],

			       skb->data[9], skb->data[10], skb->data[11],

			       skb->data[12], skb->data[13]);

			       skb->data[12], skb->data[13]);

		}

		}

#endif

#endif

drivers/net/tokenring/olympic.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -1438,13 +1438,18 @@ static void olympic_arb_cmd(struct net_device *dev) 




		if (olympic_priv->olympic_network_monitor) { 

		if (olympic_priv->olympic_network_monitor) { 

			struct trh_hdr *mac_hdr;

			struct trh_hdr *mac_hdr;

			DECLARE_MAC_BUF(mac);

			printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name);

			printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name);

			mac_hdr = tr_hdr(mac_frame);

			mac_hdr = tr_hdr(mac_frame);

			printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %s\n",

			printk(KERN_WARNING "%s: MAC Frame Dest. Addr: "

			       dev->name, print_mac(mac, mac_hdr->daddr));

			       MAC_FMT " \n", dev->name,

			printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %s\n",

			       mac_hdr->daddr[0], mac_hdr->daddr[1],

			       dev->name, print_mac(mac, mac_hdr->saddr));

			       mac_hdr->daddr[2], mac_hdr->daddr[3],

			       mac_hdr->daddr[4], mac_hdr->daddr[5]);

			printk(KERN_WARNING "%s: MAC Frame Srce. Addr: "

			       MAC_FMT " \n", dev->name,

			       mac_hdr->saddr[0], mac_hdr->saddr[1],

			       mac_hdr->saddr[2], mac_hdr->saddr[3],

			       mac_hdr->saddr[4], mac_hdr->saddr[5]);

		}

		}

		netif_rx(mac_frame);

		netif_rx(mac_frame);

		dev->last_rx = jiffies;

		dev->last_rx = jiffies;

drivers/net/virtio_net.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -234,11 +234,12 @@ static int start_xmit(struct sk_buff *skb, struct net_device *dev) 
	struct scatterlist sg[1+MAX_SKB_FRAGS];

	struct scatterlist sg[1+MAX_SKB_FRAGS];

	struct virtio_net_hdr *hdr;

	struct virtio_net_hdr *hdr;

	const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;

	const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;

	DECLARE_MAC_BUF(mac);





	sg_init_table(sg, 1+MAX_SKB_FRAGS);

	sg_init_table(sg, 1+MAX_SKB_FRAGS);





	pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest));

	pr_debug("%s: xmit %p " MAC_FMT "\n", dev->name, skb,

		 dest[0], dest[1], dest[2],

		 dest[3], dest[4], dest[5]);





	/* Encode metadata header at front. */

	/* Encode metadata header at front. */

	hdr = skb_vnet_hdr(skb);

	hdr = skb_vnet_hdr(skb);

drivers/net/wireless/hostap/hostap_80211_rx.c

+24 −15
Original line number Original line Diff line number Diff line
@@ -635,7 +635,6 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb, 
{

{

	struct ieee80211_hdr_4addr *hdr;

	struct ieee80211_hdr_4addr *hdr;

	int res, hdrlen;

	int res, hdrlen;

	DECLARE_MAC_BUF(mac);





	if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)

	if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)

		return 0;

		return 0;
@@ -647,8 +646,10 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb, 
	    strcmp(crypt->ops->name, "TKIP") == 0) {

	    strcmp(crypt->ops->name, "TKIP") == 0) {

		if (net_ratelimit()) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "

			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "

			       "received packet from %s\n",

			       "received packet from " MAC_FMT "\n",

			       local->dev->name, print_mac(mac, hdr->addr2));

			       local->dev->name,

			       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],

			       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);

		}

		}

		return -1;

		return -1;

	}

	}
@@ -657,9 +658,12 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb, 
	res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);

	res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);

	atomic_dec(&crypt->refcnt);

	atomic_dec(&crypt->refcnt);

	if (res < 0) {

	if (res < 0) {

		printk(KERN_DEBUG "%s: decryption failed (SA=%s"

		printk(KERN_DEBUG "%s: decryption failed (SA=" MAC_FMT

		       ") res=%d\n",

		       ") res=%d\n",

		       local->dev->name, print_mac(mac, hdr->addr2), res);

		       local->dev->name,

		       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],

		       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],

		       res);

		local->comm_tallies.rx_discards_wep_undecryptable++;

		local->comm_tallies.rx_discards_wep_undecryptable++;

		return -1;

		return -1;

	}

	}
@@ -721,7 +725,6 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, 
	struct ieee80211_crypt_data *crypt = NULL;

	struct ieee80211_crypt_data *crypt = NULL;

	void *sta = NULL;

	void *sta = NULL;

	int keyidx = 0;

	int keyidx = 0;

	DECLARE_MAC_BUF(mac);





	iface = netdev_priv(dev);

	iface = netdev_priv(dev);

	local = iface->local;

	local = iface->local;
@@ -798,8 +801,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, 
			 * frames silently instead of filling system log with

			 * frames silently instead of filling system log with

			 * these reports. */

			 * these reports. */

			printk(KERN_DEBUG "%s: WEP decryption failed (not set)"

			printk(KERN_DEBUG "%s: WEP decryption failed (not set)"

			       " (SA=%s)\n",

			       " (SA=" MAC_FMT ")\n",

			       local->dev->name, print_mac(mac, hdr->addr2));

			       local->dev->name,

			       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],

			       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);

#endif

#endif

			local->comm_tallies.rx_discards_wep_undecryptable++;

			local->comm_tallies.rx_discards_wep_undecryptable++;

			goto rx_dropped;

			goto rx_dropped;
@@ -813,8 +818,9 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, 
		    (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)

		    (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)

		{

		{

			printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "

			printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "

			       "from %s\n", dev->name,

			       "from " MAC_FMT "\n", dev->name,

			       print_mac(mac, hdr->addr2));

			       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],

			       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);

			/* TODO: could inform hostapd about this so that it

			/* TODO: could inform hostapd about this so that it

			 * could send auth failure report */

			 * could send auth failure report */

			goto rx_dropped;

			goto rx_dropped;
@@ -982,8 +988,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, 
			       "unencrypted EAPOL frame\n", local->dev->name);

			       "unencrypted EAPOL frame\n", local->dev->name);

		} else {

		} else {

			printk(KERN_DEBUG "%s: encryption configured, but RX "

			printk(KERN_DEBUG "%s: encryption configured, but RX "

			       "frame not encrypted (SA=%s)\n",

			       "frame not encrypted (SA=" MAC_FMT ")\n",

			       local->dev->name, print_mac(mac, hdr->addr2));

			       local->dev->name,

			       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],

			       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);

			goto rx_dropped;

			goto rx_dropped;

		}

		}

	}

	}
@@ -992,9 +1000,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb, 
	    !hostap_is_eapol_frame(local, skb)) {

	    !hostap_is_eapol_frame(local, skb)) {

		if (net_ratelimit()) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "%s: dropped unencrypted RX data "

			printk(KERN_DEBUG "%s: dropped unencrypted RX data "

			       "frame from %s"

			       "frame from " MAC_FMT " (drop_unencrypted=1)\n",

			       " (drop_unencrypted=1)\n",

			       dev->name,

			       dev->name, print_mac(mac, hdr->addr2));

			       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],

			       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);

		}

		}

		goto rx_dropped;

		goto rx_dropped;

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE