Commit 3d68bd00 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:
  Bluetooth: Fix crash with incoming L2CAP connections
  Bluetooth: Fix regression in L2CAP connection procedure
  gianfar: rx parser
  r6040: only disable RX interrupt if napi_schedule_prep is successful
  net: remove NETIF_F_ALL_TX_OFFLOADS
  net: sctp: fix checksum marking for outgoing packets
parents efcbae25 05e9a2f6

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -1428,9 +1428,9 @@ out: 
	return features;

}



#define BOND_VLAN_FEATURES	(NETIF_F_ALL_TX_OFFLOADS | \

				 NETIF_F_SOFT_FEATURES | \

				 NETIF_F_LRO)

#define BOND_VLAN_FEATURES	(NETIF_F_ALL_CSUM | NETIF_F_SG | \

				 NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \

				 NETIF_F_HIGHDMA | NETIF_F_LRO)



static void bond_compute_features(struct bonding *bond)

{

drivers/net/gianfar.c

+19 −5
Original line number Diff line number Diff line
@@ -2289,6 +2289,23 @@ static int gfar_set_mac_address(struct net_device *dev) 
	return 0;

}



/* Check if rx parser should be activated */

void gfar_check_rx_parser_mode(struct gfar_private *priv)

{

	struct gfar __iomem *regs;

	u32 tempval;



	regs = priv->gfargrp[0].regs;



	tempval = gfar_read(&regs->rctrl);

	/* If parse is no longer required, then disable parser */

	if (tempval & RCTRL_REQ_PARSER)

		tempval |= RCTRL_PRSDEP_INIT;

	else

		tempval &= ~RCTRL_PRSDEP_INIT;

	gfar_write(&regs->rctrl, tempval);

}





/* Enables and disables VLAN insertion/extraction */

static void gfar_vlan_rx_register(struct net_device *dev,
@@ -2325,12 +2342,9 @@ static void gfar_vlan_rx_register(struct net_device *dev, 
		/* Disable VLAN tag extraction */

		tempval = gfar_read(&regs->rctrl);

		tempval &= ~RCTRL_VLEX;

		/* If parse is no longer required, then disable parser */

		if (tempval & RCTRL_REQ_PARSER)

			tempval |= RCTRL_PRSDEP_INIT;

		else

			tempval &= ~RCTRL_PRSDEP_INIT;

		gfar_write(&regs->rctrl, tempval);



		gfar_check_rx_parser_mode(priv);

	}



	gfar_change_mtu(dev, dev->mtu);

drivers/net/gianfar.h

+2 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ extern const char gfar_driver_version[]; 
#define RCTRL_PROM		0x00000008

#define RCTRL_EMEN		0x00000002

#define RCTRL_REQ_PARSER	(RCTRL_VLEX | RCTRL_IPCSEN | \

				 RCTRL_TUCSEN)

				 RCTRL_TUCSEN | RCTRL_FILREN)

#define RCTRL_CHECKSUMMING	(RCTRL_IPCSEN | RCTRL_TUCSEN | \

				RCTRL_PRSDEP_INIT)

#define RCTRL_EXTHASH		(RCTRL_GHTX)
@@ -1156,6 +1156,7 @@ extern void gfar_configure_coalescing(struct gfar_private *priv, 
		unsigned long tx_mask, unsigned long rx_mask);

void gfar_init_sysfs(struct net_device *dev);

int gfar_set_features(struct net_device *dev, u32 features);

extern void gfar_check_rx_parser_mode(struct gfar_private *priv);



extern const struct ethtool_ops gfar_ethtool_ops;

drivers/net/r6040.c

+5 −3
Original line number Diff line number Diff line
@@ -677,9 +677,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) 
		if (status & RX_FIFO_FULL)

			dev->stats.rx_fifo_errors++;



		if (likely(napi_schedule_prep(&lp->napi))) {

			/* Mask off RX interrupt */

			misr &= ~RX_INTS;

		napi_schedule(&lp->napi);

			__napi_schedule(&lp->napi);

		}

	}



	/* TX interrupt request */

include/linux/netdevice.h

+0 −6
Original line number Diff line number Diff line
@@ -1097,12 +1097,6 @@ struct net_device { 
#define NETIF_F_ALL_FCOE	(NETIF_F_FCOE_CRC | NETIF_F_FCOE_MTU | \

				 NETIF_F_FSO)



#define NETIF_F_ALL_TX_OFFLOADS	(NETIF_F_ALL_CSUM | NETIF_F_SG | \

				 NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \

				 NETIF_F_HIGHDMA | \

				 NETIF_F_SCTP_CSUM | \

				 NETIF_F_ALL_FCOE)



	/*

	 * If one device supports one of these features, then enable them

	 * for all in netdev_increment_features.

CRA Git | Maintained and supported by SUSTech CRA and CCSE