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

Commit a4cfae13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [ATM]: fix broken uses of NIPQUAD in net/atm
  [SCTP]: sctp_unpack_cookie() fix
  [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
  [NET]: Prevent multiple qdisc runs
  [CONNECTOR]: Initialize subsystem earlier.
  [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length
parents be883da7 ff7512e1

drivers/connector/connector.c

+9 −5
Original line number Diff line number Diff line
@@ -308,6 +308,9 @@ int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *)) 
	int err;

	struct cn_dev *dev = &cdev;



	if (!cn_already_initialized)

		return -EAGAIN;



	err = cn_queue_add_callback(dev->cbdev, name, id, callback);

	if (err)

		return err;
@@ -435,7 +438,7 @@ static void cn_callback(void *data) 
	mutex_unlock(&notify_lock);

}



static int __init cn_init(void)

static int __devinit cn_init(void)

{

	struct cn_dev *dev = &cdev;

	int err;
@@ -457,20 +460,21 @@ static int __init cn_init(void) 
		return -EINVAL;

	}

	

	cn_already_initialized = 1;



	err = cn_add_callback(&dev->id, "connector", &cn_callback);

	if (err) {

		cn_already_initialized = 0;

		cn_queue_free_dev(dev->cbdev);

		if (dev->nls->sk_socket)

			sock_release(dev->nls->sk_socket);

		return -EINVAL;

	}



	cn_already_initialized = 1;



	return 0;

}



static void __exit cn_fini(void)

static void __devexit cn_fini(void)

{

	struct cn_dev *dev = &cdev;
@@ -482,7 +486,7 @@ static void __exit cn_fini(void) 
		sock_release(dev->nls->sk_socket);

}



module_init(cn_init);

subsys_initcall(cn_init);

module_exit(cn_fini);



EXPORT_SYMBOL_GPL(cn_add_callback);

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ enum netdev_state_t 
	__LINK_STATE_RX_SCHED,

	__LINK_STATE_LINKWATCH_PENDING,

	__LINK_STATE_DORMANT,

	__LINK_STATE_QDISC_RUNNING,

};

include/net/pkt_sched.h

+4 −3
Original line number Diff line number Diff line
@@ -218,12 +218,13 @@ extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, 
		struct rtattr *tab);

extern void qdisc_put_rtab(struct qdisc_rate_table *tab);



extern int qdisc_restart(struct net_device *dev);

extern void __qdisc_run(struct net_device *dev);



static inline void qdisc_run(struct net_device *dev)

{

	while (!netif_queue_stopped(dev) && qdisc_restart(dev) < 0)

		/* NOTHING */;

	if (!netif_queue_stopped(dev) &&

	    !test_and_set_bit(__LINK_STATE_QDISC_RUNNING, &dev->state))

		__qdisc_run(dev);

}



extern int tc_classify(struct sk_buff *skb, struct tcf_proto *tp,

include/net/sctp/sctp.h

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ extern int sctp_debug_flag; 
#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)

#define SCTP_ENABLE_DEBUG

#define SCTP_DISABLE_DEBUG

#define SCTP_ASSERT(expr, str, func) BUG_ON(!(expr))

#define SCTP_ASSERT(expr, str, func)



#endif /* SCTP_DEBUG */

net/atm/mpc.c

+3 −10
Original line number Diff line number Diff line
@@ -229,20 +229,15 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *entry) 
/* this is buggered - we need locking for qos_head */

void atm_mpoa_disp_qos(struct seq_file *m)

{

	unsigned char *ip;

	char ipaddr[16];

	struct atm_mpoa_qos *qos;



	qos = qos_head;

	seq_printf(m, "QoS entries for shortcuts:\n");

	seq_printf(m, "IP address\n  TX:max_pcr pcr     min_pcr max_cdv max_sdu\n  RX:max_pcr pcr     min_pcr max_cdv max_sdu\n");



	ipaddr[sizeof(ipaddr)-1] = '\0';

	while (qos != NULL) {

		ip = (unsigned char *)&qos->ipaddr;

		sprintf(ipaddr, "%u.%u.%u.%u", NIPQUAD(ip));

		seq_printf(m, "%u.%u.%u.%u\n     %-7d %-7d %-7d %-7d %-7d\n     %-7d %-7d %-7d %-7d %-7d\n",

				NIPQUAD(ipaddr),

				NIPQUAD(qos->ipaddr),

				qos->qos.txtp.max_pcr, qos->qos.txtp.pcr, qos->qos.txtp.min_pcr, qos->qos.txtp.max_cdv, qos->qos.txtp.max_sdu,

				qos->qos.rxtp.max_pcr, qos->qos.rxtp.pcr, qos->qos.rxtp.min_pcr, qos->qos.rxtp.max_cdv, qos->qos.rxtp.max_sdu);

		qos = qos->next;
@@ -1083,7 +1078,6 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc) 
static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_client *client, in_cache_entry *entry)

{

	uint32_t dst_ip = msg->content.in_info.in_dst_ip;

	unsigned char *ip __attribute__ ((unused)) = (unsigned char *)&dst_ip;

	struct atm_mpoa_qos *qos = atm_mpoa_search_qos(dst_ip);

	eg_cache_entry *eg_entry = client->eg_ops->get_by_src_ip(dst_ip, client);
@@ -1097,7 +1091,7 @@ static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_clien 
				    entry->shortcut = eg_entry->shortcut;

		}

	 	if(entry->shortcut){

			dprintk("mpoa: (%s) using egress SVC to reach %u.%u.%u.%u\n",client->dev->name, NIPQUAD(ip));

			dprintk("mpoa: (%s) using egress SVC to reach %u.%u.%u.%u\n",client->dev->name, NIPQUAD(dst_ip));

			client->eg_ops->put(eg_entry);

			return;

		}
@@ -1123,8 +1117,7 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) 


	uint32_t dst_ip = msg->content.in_info.in_dst_ip;

	in_cache_entry *entry = mpc->in_ops->get(dst_ip, mpc);

	ip = (unsigned char *)&dst_ip;

	dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n", mpc->dev->name, NIPQUAD(ip));

	dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n", mpc->dev->name, NIPQUAD(dst_ip));

	ddprintk("mpoa: (%s) MPOA_res_reply_rcvd() entry = %p", mpc->dev->name, entry);

	if(entry == NULL){

		printk("\nmpoa: (%s) ARGH, received res. reply for an entry that doesn't exist.\n", mpc->dev->name);