Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 913f2d79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents fe3f2053 73d4f84f

drivers/net/tg3.c

+9 −6
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.43"

#define DRV_MODULE_RELDATE	"Oct 24, 2005"

#define DRV_MODULE_VERSION	"3.44"

#define DRV_MODULE_RELDATE	"Dec 6, 2005"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -3565,12 +3565,15 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (!spin_trylock(&tp->tx_lock))

		return NETDEV_TX_LOCKED; 



	/* This is a hard error, log it. */

	if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {

		if (!netif_queue_stopped(dev)) {

			netif_stop_queue(dev);



			/* This is a hard error, log it. */

			printk(KERN_ERR PFX "%s: BUG! Tx Ring full when "

			       "queue awake!\n", dev->name);

		}

		spin_unlock(&tp->tx_lock);

		printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",

		       dev->name);

		return NETDEV_TX_BUSY;

	}

include/linux/sysctl.h

+3 −0
Original line number Diff line number Diff line
@@ -670,6 +670,9 @@ enum { 
	NET_DECNET_DST_GC_INTERVAL = 9,

	NET_DECNET_CONF = 10,

	NET_DECNET_NO_FC_MAX_CWND = 11,

	NET_DECNET_MEM = 12,

	NET_DECNET_RMEM = 13,

	NET_DECNET_WMEM = 14,

	NET_DECNET_DEBUG_LEVEL = 255

};

include/net/dn.h

+4 −0
Original line number Diff line number Diff line
@@ -234,4 +234,8 @@ extern int decnet_di_count; 
extern int decnet_dr_count;

extern int decnet_no_fc_max_cwnd;



extern int sysctl_decnet_mem[3];

extern int sysctl_decnet_wmem[3];

extern int sysctl_decnet_rmem[3];



#endif /* _NET_DN_H */

net/core/dev.c

+2 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,8 @@ int skb_checksum_help(struct sk_buff *skb, int inward) 
void netdev_rx_csum_fault(struct net_device *dev)

{

	if (net_ratelimit()) {

		printk(KERN_ERR "%s: hw csum failure.\n", dev->name);

		printk(KERN_ERR "%s: hw csum failure.\n", 

			dev ? dev->name : "<unknown>");

		dump_stack();

	}

}

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -1725,7 +1725,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, 
 * of the skb if any page alloc fails user this procedure returns  -ENOMEM

 */

int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,

			int getfrag(void *from, char *to, int offset,

			int (*getfrag)(void *from, char *to, int offset,

					int len, int odd, struct sk_buff *skb),

			void *from, int length)

{