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

Commit ca1a6ba5 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:
  sch_htb: fix "too many events" situation
  connector: convert to single-threaded workqueue
  [ATM]: When proc_create() fails, do some error handling work and return -ENOMEM.
  [SUNGEM]: Fix NAPI assertion failure.
  BNX2X: prevent ethtool from setting port type
  [9P] net/9p/trans_fd.c: remove unused variable
  [IPV6] net/ipv6/ndisc.c: remove unused variable
  [IPV4] fib_trie: fix warning from rcu_assign_poinger
  [TCP]: Let skbs grow over a page on fast peers
  [DLCI]: Fix tiny race between module unload and sock_ioctl.
  [SCTP]: Fix build warnings with IPV6 disabled.
  [IPV4]: Fix null dereference in ip_defrag
parents d3073779 8f3ea33a

drivers/connector/cn_queue.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls) 




	dev->nls = nls;

	dev->nls = nls;





	dev->cn_queue = create_workqueue(dev->name);

	dev->cn_queue = create_singlethread_workqueue(dev->name);

	if (!dev->cn_queue) {

	if (!dev->cn_queue) {

		kfree(dev);

		kfree(dev);

		return NULL;

		return NULL;

drivers/net/bnx2x.c

+2 −34
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.40.22"

#define DRV_MODULE_VERSION      "1.42.3"

#define DRV_MODULE_RELDATE      "2007/11/27"

#define DRV_MODULE_RELDATE      "2008/3/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. */
@@ -8008,38 +8008,6 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	   cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,

	   cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,

	   cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);

	   cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);





	switch (cmd->port) {

	case PORT_TP:

		if (!(bp->supported & SUPPORTED_TP)) {

			DP(NETIF_MSG_LINK, "TP not supported\n");

			return -EINVAL;

		}



		if (bp->phy_flags & PHY_XGXS_FLAG) {

			bnx2x_link_reset(bp);

			bnx2x_link_settings_supported(bp, SWITCH_CFG_1G);

			bnx2x_phy_deassert(bp);

		}

		break;



	case PORT_FIBRE:

		if (!(bp->supported & SUPPORTED_FIBRE)) {

			DP(NETIF_MSG_LINK, "FIBRE not supported\n");

			return -EINVAL;

		}



		if (!(bp->phy_flags & PHY_XGXS_FLAG)) {

			bnx2x_link_reset(bp);

			bnx2x_link_settings_supported(bp, SWITCH_CFG_10G);

			bnx2x_phy_deassert(bp);

		}

		break;



	default:

		DP(NETIF_MSG_LINK, "Unknown port type\n");

		return -EINVAL;

	}



	if (cmd->autoneg == AUTONEG_ENABLE) {

	if (cmd->autoneg == AUTONEG_ENABLE) {

		if (!(bp->supported & SUPPORTED_Autoneg)) {

		if (!(bp->supported & SUPPORTED_Autoneg)) {

			DP(NETIF_MSG_LINK, "Aotoneg not supported\n");

			DP(NETIF_MSG_LINK, "Aotoneg not supported\n");

drivers/net/sungem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -912,7 +912,7 @@ static int gem_poll(struct napi_struct *napi, int budget) 
		 * rx ring - must call napi_disable(), which

		 * rx ring - must call napi_disable(), which

		 * schedule_timeout()'s if polling is already disabled.

		 * schedule_timeout()'s if polling is already disabled.

		 */

		 */

		work_done += gem_rx(gp, budget);

		work_done += gem_rx(gp, budget - work_done);





		if (work_done >= budget)

		if (work_done >= budget)

			return work_done;

			return work_done;

include/net/sctp/sctp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -389,7 +389,7 @@ void sctp_v6_del_protocol(void); 




#else /* #ifdef defined(CONFIG_IPV6) */

#else /* #ifdef defined(CONFIG_IPV6) */





static inline void sctp_v6_pf_init(void) { return 0; }

static inline void sctp_v6_pf_init(void) { return; }

static inline void sctp_v6_pf_exit(void) { return; }

static inline void sctp_v6_pf_exit(void) { return; }

static inline int sctp_v6_protosw_init(void) { return 0; }

static inline int sctp_v6_protosw_init(void) { return 0; }

static inline void sctp_v6_protosw_exit(void) { return; }

static inline void sctp_v6_protosw_exit(void) { return; }

net/9p/trans_fd.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -861,7 +861,6 @@ static void p9_mux_free_request(struct p9_conn *m, struct p9_req *req) 




static void p9_mux_flush_cb(struct p9_req *freq, void *a)

static void p9_mux_flush_cb(struct p9_req *freq, void *a)

{

{

	p9_conn_req_callback cb;

	int tag;

	int tag;

	struct p9_conn *m;

	struct p9_conn *m;

	struct p9_req *req, *rreq, *rptr;

	struct p9_req *req, *rreq, *rptr;
@@ -872,7 +871,6 @@ static void p9_mux_flush_cb(struct p9_req *freq, void *a) 
		freq->tcall->params.tflush.oldtag);

		freq->tcall->params.tflush.oldtag);





	spin_lock(&m->lock);

	spin_lock(&m->lock);

	cb = NULL;

	tag = freq->tcall->params.tflush.oldtag;

	tag = freq->tcall->params.tflush.oldtag;

	req = NULL;

	req = NULL;

	list_for_each_entry_safe(rreq, rptr, &m->req_list, req_list) {

	list_for_each_entry_safe(rreq, rptr, &m->req_list, req_list) {