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

Commit 0ee13079 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [PKTGEN]: Remove write-only variable.
  [NETFILTER]: xt_tcpudp: fix wrong struct in udp_checkentry
  [NET_SCHED] sch_prio.c: remove duplicate call of tc_classify()
  [BRIDGE]: Fix OOPS when bridging device without ethtool.
  [BRIDGE]: Packets leaking out of disabled/blocked ports.
  [TCP]: Allow minimum RTO to be configurable via routing metrics.
  SCTP: Fix to handle invalid parameter length correctly
  SCTP: Abort on COOKIE-ECHO if backlog is exceeded.
  SCTP: Correctly disable listening when backlog is 0.
  SCTP: Do not retransmit chunks that are newer then rtt.
  SCTP: Uncomfirmed transports can't become Inactive
  SCTP: Pick the correct port when binding to 0.
  SCTP: Use net_ratelimit to suppress error messages print too fast
  SCTP: Fix to encode PROTOCOL VIOLATION error cause correctly
  SCTP: Fix sctp_addto_chunk() to add pad with correct length
  SCTP: Assign stream sequence numbers to the entire message
  SCTP: properly clean up fragment and ordering queues during FWD-TSN.
  [PKTGEN]: Fix multiqueue oops.
  [BNX2]: Add write posting comment.
  [BNX2]: Use msleep().
parents 2d8348b4 88282c6e

drivers/net/bnx2.c

+6 −4
Original line number Diff line number Diff line
@@ -3934,11 +3934,13 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code) 
		/* Chip reset. */

		REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);



		/* Reading back any register after chip reset will hang the

		 * bus on 5706 A0 and A1.  The msleep below provides plenty

		 * of margin for write posting.

		 */

		if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||

		    (CHIP_ID(bp) == CHIP_ID_5706_A1)) {

			current->state = TASK_UNINTERRUPTIBLE;

			schedule_timeout(HZ / 50);

		}

		    (CHIP_ID(bp) == CHIP_ID_5706_A1))

			msleep(20);



		/* Reset takes approximate 30 usec */

		for (i = 0; i < 10; i++) {

include/linux/rtnetlink.h

+2 −0
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ enum 
#define RTAX_INITCWND RTAX_INITCWND

	RTAX_FEATURES,

#define RTAX_FEATURES RTAX_FEATURES

	RTAX_RTO_MIN,

#define RTAX_RTO_MIN RTAX_RTO_MIN

	__RTAX_MAX

};

include/net/sctp/sm.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc, 
					  const struct sctp_chunk *);

struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *,

					  const struct sctp_chunk *);

void sctp_init_cause(struct sctp_chunk *, __be16 cause, const void *, size_t);

void sctp_init_cause(struct sctp_chunk *, __be16 cause, size_t);

struct sctp_chunk *sctp_make_abort(const struct sctp_association *,

			      const struct sctp_chunk *,

			      const size_t hint);

include/net/sctp/structs.h

+1 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len, 
			  struct iovec *data);

void sctp_chunk_free(struct sctp_chunk *);

void  *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);

void  *sctp_addto_param(struct sctp_chunk *, int len, const void *data);

struct sctp_chunk *sctp_chunkify(struct sk_buff *,

				 const struct sctp_association *,

				 struct sock *);

include/net/sctp/ulpqueue.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc); 
/* Skip over an SSN. */

void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn);



void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *, __u32);

#endif /* __sctp_ulpqueue_h__ */