Commit eeaecb86 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: (39 commits)
  Revert "p54: Use SKB list handling helpers instead of by-hand code."
  sctp: fix warning at inet_sock_destruct() while release sctp socket
  tun/tap: Fix crashes if open() /dev/net/tun and then poll() it.
  dsa: fix 88e6xxx statistics counter snapshotting
  forcedeth: Fix NAPI race.
  drivers/net/smsc911x.c: Fix resource size off by 1 error
  pcnet_cs: add new id
  bnx2x: Fix the maximal values of coalescing timeouts.
  bnx2x: Disable HC coalescing when setting timeout to zero.
  tun: Fix device unregister race
  be2net: fix spurious interrupt handling in intx mode
  e1000e: disable K1 at 1000Mbps for 82577/82578
  e1000e: delay second read of PHY_STATUS register on failure of first read
  e1000e: prevent NVM corruption on sectors larger than 4K
  e1000e: do not write SmartSpeed register bits on parts without support
  e1000e: delay after LCD reset and proper checks for PHY configuration done
  e1000e: PHY loopback broken on 82578
  ixgbe: Not allow 8259x unsupported wol options change from ethtool
  ixgbe: fix inconsistent SFP/SFP+ failure results.
  ixgbe: fix regression on some 82598 adapters
  ...
parents dc53fffc 0ca1b08e

drivers/isdn/gigaset/ev-layer.c

+20 −24
Original line number Diff line number Diff line
@@ -294,32 +294,33 @@ struct reply_t gigaset_tab_cid[] = 
	{RSP_OK,      604,604, -1,                605, 5, {ACT_CMD+AT_MSN}},

	{RSP_OK,      605,605, -1,                606, 5, {ACT_CMD+AT_ISO}},

	{RSP_NULL,    605,605, -1,                606, 5, {ACT_CMD+AT_ISO}},

	{RSP_OK,      606,606, -1,                607, 5, {0},             "+VLS=17\r"}, /* set "Endgeraetemodus" */

	{RSP_OK,      606,606, -1,                607, 5, {0}, "+VLS=17\r"},

	{RSP_OK,      607,607, -1,                608,-1},

	//{RSP_ZSAU,    608,608,ZSAU_PROCEEDING,    608, 0, {ACT_ERROR}},//DELETE

	{RSP_ZSAU,    608,608,ZSAU_PROCEEDING,    609, 5, {ACT_CMD+AT_DIAL}},

	{RSP_OK,      609,609, -1,                650, 0, {ACT_DIALING}},



	{RSP_ZVLS,    608,608, 17,                 -1,-1, {ACT_DEBUG}},

	{RSP_ZCTP,    609,609, -1,                 -1,-1, {ACT_DEBUG}},

	{RSP_ZCPN,    609,609, -1,                 -1,-1, {ACT_DEBUG}},

	{RSP_ERROR,   601,609, -1,                  0, 0, {ACT_ABORTDIAL}},

	{EV_TIMEOUT,  601,609, -1,                  0, 0, {ACT_ABORTDIAL}},



	/* dialing */

	{RSP_ZCTP,    650,650, -1,                 -1,-1, {ACT_DEBUG}},

	{RSP_ZCPN,    650,650, -1,                 -1,-1, {ACT_DEBUG}},

	{RSP_ZSAU,    650,650,ZSAU_CALL_DELIVERED, -1,-1, {ACT_DEBUG}}, /* some devices don't send this */



	/* connection established  */

	{RSP_ZSAU,    650,650,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT}}, //FIXME -> DLE1

	{RSP_ZSAU,    750,750,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT}}, //FIXME -> DLE1



	{EV_BC_OPEN,  800,800, -1,                800,-1, {ACT_NOTIFY_BC_UP}}, //FIXME new constate + timeout

	/* optional dialing responses */

	{EV_BC_OPEN,  650,650, -1,                651,-1},

	{RSP_ZVLS,    608,651, 17,                 -1,-1, {ACT_DEBUG}},

	{RSP_ZCTP,    609,651, -1,                 -1,-1, {ACT_DEBUG}},

	{RSP_ZCPN,    609,651, -1,                 -1,-1, {ACT_DEBUG}},

	{RSP_ZSAU,    650,651,ZSAU_CALL_DELIVERED, -1,-1, {ACT_DEBUG}},



	/* connect */

	{RSP_ZSAU,    650,650,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT}},

	{RSP_ZSAU,    651,651,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT,

							   ACT_NOTIFY_BC_UP}},

	{RSP_ZSAU,    750,750,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT}},

	{RSP_ZSAU,    751,751,ZSAU_ACTIVE,        800,-1, {ACT_CONNECT,

							   ACT_NOTIFY_BC_UP}},

	{EV_BC_OPEN,  800,800, -1,                800,-1, {ACT_NOTIFY_BC_UP}},



	/* remote hangup */

	{RSP_ZSAU,    650,650,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEREJECT}},

	{RSP_ZSAU,    750,750,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEHUP}},

	{RSP_ZSAU,    650,651,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEREJECT}},

	{RSP_ZSAU,    750,751,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEHUP}},

	{RSP_ZSAU,    800,800,ZSAU_DISCONNECT_IND,  0, 0, {ACT_REMOTEHUP}},



	/* hangup */
@@ -358,7 +359,8 @@ struct reply_t gigaset_tab_cid[] = 
	{RSP_ZSAU,    700,729,ZSAU_ACTIVE,          0, 0, {ACT_ABORTACCEPT}},

	{RSP_ZSAU,    700,729,ZSAU_DISCONNECT_IND,  0, 0, {ACT_ABORTACCEPT}},



	{EV_TIMEOUT,  750,750, -1,                  0, 0, {ACT_CONNTIMEOUT}},

	{EV_BC_OPEN,  750,750, -1,                751,-1},

	{EV_TIMEOUT,  750,751, -1,                  0, 0, {ACT_CONNTIMEOUT}},



	/* B channel closed (general case) */

	{EV_BC_CLOSED, -1, -1, -1,                 -1,-1, {ACT_NOTIFY_BC_DOWN}}, //FIXME
@@ -876,12 +878,6 @@ static void bchannel_down(struct bc_state *bcs) 


static void bchannel_up(struct bc_state *bcs)

{

	if (!(bcs->chstate & CHS_D_UP)) {

		dev_notice(bcs->cs->dev, "%s: D channel not up\n", __func__);

		bcs->chstate |= CHS_D_UP;

		gigaset_i4l_channel_cmd(bcs, ISDN_STAT_DCONN);

	}



	if (bcs->chstate & CHS_B_UP) {

		dev_notice(bcs->cs->dev, "%s: B channel already up\n",

			   __func__);

drivers/isdn/gigaset/isocdata.c

+0 −6
Original line number Diff line number Diff line
@@ -174,12 +174,6 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size) 
		pr_err("invalid size %d\n", size);

		return -EINVAL;

	}

	src = iwb->read;

	if (unlikely(limit >= BAS_OUTBUFSIZE + BAS_OUTBUFPAD ||

		     (read < src && limit >= src))) {

		pr_err("isoc write buffer frame reservation violated\n");

		return -EFAULT;

	}

#endif



	if (read < write) {

drivers/net/benet/be_hw.h

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ 
#define MEMBAR_CTRL_INT_CTRL_PFUNC_MASK  	0x7 	/* bits 26 - 28 */

#define MEMBAR_CTRL_INT_CTRL_PFUNC_SHIFT	26



/********* ISR0 Register offset **********/

#define CEV_ISR0_OFFSET 			0xC18

#define CEV_ISR_SIZE				4



/********* Event Q door bell *************/

#define DB_EQ_OFFSET			DB_CQ_OFFSET

#define DB_EQ_RING_ID_MASK		0x1FF	/* bits 0 - 8 */

drivers/net/benet/be_main.c

+9 −7
Original line number Diff line number Diff line
@@ -1274,15 +1274,17 @@ static irqreturn_t be_intx(int irq, void *dev) 
{

	struct be_adapter *adapter = dev;

	struct be_ctrl_info *ctrl = &adapter->ctrl;

	int rx, tx;

        int isr;



	tx = event_handle(ctrl, &adapter->tx_eq);

	rx = event_handle(ctrl, &adapter->rx_eq);

	isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET +

                      ctrl->pci_func * CEV_ISR_SIZE);

	if (!isr)

                return IRQ_NONE;



        event_handle(ctrl, &adapter->tx_eq);

        event_handle(ctrl, &adapter->rx_eq);



	if (rx || tx)

        return IRQ_HANDLED;

	else

		return IRQ_NONE;

}



static irqreturn_t be_msix_rx(int irq, void *dev)

drivers/net/bnx2x.h

+2 −0
Original line number Diff line number Diff line
@@ -902,6 +902,8 @@ struct bnx2x { 
	u16			rx_quick_cons_trip;

	u16			rx_ticks_int;

	u16			rx_ticks;

/* Maximal coalescing timeout in us */

#define BNX2X_MAX_COALESCE_TOUT		(0xf0*12)



	u32			lin_cnt;

CRA Git | Maintained and supported by SUSTech CRA and CCSE