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

Commit d6e8823e 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:
  [NETFILTER]: nat: avoid rerouting packets if only XFRM policy key changed
  [NETFILTER]: nf_conntrack_netlink: add missing dependency on NF_NAT
  [NET]: fix up misplaced inlines.
  [SCTP]: Correctly reset ssthresh when restarting association
  [BRIDGE]: Fix fdb RCU race
  [NET]: Fix fib_rules dump race
  [XFRM]: ipsecv6 needs a space when printing audit record.
  [X25] x25_forward_call(): fix NULL dereferences
  [SCTP]: Reset some transport and association variables on restart
  [SCTP]: Increment error counters on user requested HBs.
  [SCTP]: Clean up stale data during association restart
  [IrDA]: Calling ppp_unregister_channel() from process context
  [IrDA]: irttp_dup spin_lock initialisation
  [IrDA]: Delay needed when uploading firmware chunks
parents f64cd9de 848c29fd

drivers/net/irda/irda-usb.c

+2 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,8 @@ static int stir421x_fw_upload(struct irda_usb_cb *self, 


		if (ret < 0)

			break;



		mdelay(10);

	}



	kfree(patch_block);

include/net/sctp/structs.h

+1 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,7 @@ void sctp_transport_update_rto(struct sctp_transport *, __u32); 
void sctp_transport_raise_cwnd(struct sctp_transport *, __u32, __u32);

void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t);

unsigned long sctp_transport_timeout(struct sctp_transport *);

void sctp_transport_reset(struct sctp_transport *);





/* This is the structure we use to queue packets as they come into

include/net/sctp/ulpqueue.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct sctp_ulpq { 
/* Prototypes. */

struct sctp_ulpq *sctp_ulpq_init(struct sctp_ulpq *,

				 struct sctp_association *);

void sctp_ulpq_flush(struct sctp_ulpq *ulpq);

void sctp_ulpq_free(struct sctp_ulpq *);



/* Add a new DATA chunk for processing. */

net/bluetooth/hidp/core.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int __hidp_send_ctrl_message(struct hidp_session *session, 
	return 0;

}



static int inline hidp_send_ctrl_message(struct hidp_session *session,

static inline int hidp_send_ctrl_message(struct hidp_session *session,

			unsigned char hdr, unsigned char *data, int size)

{

	int err;

net/bridge/br_fdb.c

+2 −2
Original line number Diff line number Diff line
@@ -197,8 +197,8 @@ struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br, 


	rcu_read_lock();

	fdb = __br_fdb_get(br, addr);

	if (fdb)

		atomic_inc(&fdb->use_count);

	if (fdb && !atomic_inc_not_zero(&fdb->use_count))

		fdb = NULL;

	rcu_read_unlock();

	return fdb;

}