Commit fd4d3429 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:
  cls_cgroup: Fix oops when user send improperly 'tc filter add' request
  r8169: fix crash when large packets are received
parents 4d11eff6 52ea3a56

drivers/net/r8169.c

+5 −6
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static const int multicast_filter_limit = 32; 
#define RX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */

#define TX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */

#define EarlyTxThld	0x3F	/* 0x3F means NO early transmit */

#define RxPacketMaxSize	0x3FE8	/* 16K - 1 - ETH_HLEN - VLAN - CRC... */

#define SafeMtu		0x1c20	/* ... actually life sucks beyond ~7k */

#define InterFrameGap	0x03	/* 3 means InterFrameGap = the shortest one */
@@ -2357,10 +2356,10 @@ static u16 rtl_rw_cpluscmd(void __iomem *ioaddr) 
	return cmd;

}



static void rtl_set_rx_max_size(void __iomem *ioaddr)

static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz)

{

	/* Low hurts. Let's disable the filtering. */

	RTL_W16(RxMaxSize, 16383);

	RTL_W16(RxMaxSize, rx_buf_sz);

}



static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
@@ -2407,7 +2406,7 @@ static void rtl_hw_start_8169(struct net_device *dev) 


	RTL_W8(EarlyTxThres, EarlyTxThld);



	rtl_set_rx_max_size(ioaddr);

	rtl_set_rx_max_size(ioaddr, tp->rx_buf_sz);



	if ((tp->mac_version == RTL_GIGA_MAC_VER_01) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_02) ||
@@ -2668,7 +2667,7 @@ static void rtl_hw_start_8168(struct net_device *dev) 


	RTL_W8(EarlyTxThres, EarlyTxThld);



	rtl_set_rx_max_size(ioaddr);

	rtl_set_rx_max_size(ioaddr, tp->rx_buf_sz);



	tp->cp_cmd |= RTL_R16(CPlusCmd) | PktCntrDisable | INTT_1;
@@ -2846,7 +2845,7 @@ static void rtl_hw_start_8101(struct net_device *dev) 


	RTL_W8(EarlyTxThres, EarlyTxThld);



	rtl_set_rx_max_size(ioaddr);

	rtl_set_rx_max_size(ioaddr, tp->rx_buf_sz);



	tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;

net/sched/cls_cgroup.c

+3 −0
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ static int cls_cgroup_change(struct tcf_proto *tp, unsigned long base, 
	struct tcf_exts e;

	int err;



	if (!tca[TCA_OPTIONS])

		return -EINVAL;



	if (head == NULL) {

		if (!handle)

			return -EINVAL;