Commit 1e0e76cf 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:
  [IPV6] addrconf: Fix IPv6 on tuntap tunnels
  [TCP]: Add missing break to TCP option parsing code
  [SCTP] Don't disable PMTU discovery when mtu is small
  [SCTP] Flag a pmtu change request
  [SCTP] Update pmtu handling to be similar to tcp
  [SCTP] Fix leak in sctp_getsockopt_local_addrs when copy_to_user fails
  [SCTP]: Allow unspecified port in sctp_bindx()
  [SCTP]: Correctly set daddr for IPv6 sockets during peeloff
  [TCP]: Set initial_ssthresh default to zero in Cubic and BIC.
  [TCP]: Fix left_out setting during FRTO
  [TCP]: Disable TSO if MD5SIG is enabled.
  [PPP_MPPE]: Fix "osize too small" check.
  [PATCH] mac80211: Don't stop tx queue on master device while scanning.
  [PATCH] mac80211: fix debugfs tx power reduction output
  [PATCH] cfg80211: fix signed macaddress in sysfs
  [IrDA]: f-timer reloading when sending rejected frames.
  [IrDA]: Fix Rx/Tx path race.
parents f701737d 559f0a28

drivers/net/ppp_mppe.c

+5 −5
Original line number Diff line number Diff line
@@ -493,14 +493,14 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf, 


	/*

	 * Make sure we have enough room to decrypt the packet.

	 * Note that for our test we only subtract 1 byte whereas in

	 * mppe_compress() we added 2 bytes (+MPPE_OVHD);

	 * this is to account for possible PFC.

	 * To account for possible PFC we should only subtract 1

	 * byte whereas in mppe_compress() we added 2 bytes (+MPPE_OVHD);

	 * However, we assume no PFC, thus subtracting 2 bytes.

	 */

	if (osize < isize - MPPE_OVHD - 1) {

	if (osize < isize - MPPE_OVHD - 2) {

		printk(KERN_DEBUG "mppe_decompress[%d]: osize too small! "

		       "(have: %d need: %d)\n", state->unit,

		       osize, isize - MPPE_OVHD - 1);

		       osize, isize - MPPE_OVHD - 2);

		return DECOMP_ERROR;

	}

	osize = isize - MPPE_OVHD - 2;	/* assume no PFC */

include/net/irda/irlap.h

+17 −0
Original line number Diff line number Diff line
@@ -289,4 +289,21 @@ static inline void irlap_clear_disconnect(struct irlap_cb *self) 
	self->disconnect_pending = FALSE;

}



/*

 * Function irlap_next_state (self, state)

 *

 *    Switches state and provides debug information

 *

 */

static inline void irlap_next_state(struct irlap_cb *self, IRLAP_STATE state)

{

	/*

	if (!self || self->magic != LAP_MAGIC)

		return;



	IRDA_DEBUG(4, "next LAP state = %s\n", irlap_state[state]);

	*/

	self->state = state;

}



#endif

include/net/sctp/sctp.h

+7 −0
Original line number Diff line number Diff line
@@ -503,6 +503,13 @@ static inline int sctp_frag_point(const struct sctp_sock *sp, int pmtu) 
	return frag;

}



static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc)

{



	sctp_assoc_sync_pmtu(asoc);

	asoc->pmtu_pending = 0;

}



/* Walk through a list of TLV parameters.  Don't trust the

 * individual parameter lengths and instead depend on

 * the chunk length to indicate when to stop.  Make sure

include/net/sctp/structs.h

+7 −0
Original line number Diff line number Diff line
@@ -912,6 +912,9 @@ struct sctp_transport { 
	 */

	__u16 pathmaxrxt;



	/* is the Path MTU update pending on this tranport */

	__u8 pmtu_pending;



	/* PMTU	      : The current known path MTU.  */

	__u32 pathmtu;
@@ -1006,6 +1009,7 @@ 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 *);

void sctp_transport_update_pmtu(struct sctp_transport *, u32);





/* This is the structure we use to queue packets as they come into
@@ -1565,6 +1569,9 @@ struct sctp_association { 
	 */

	__u16 pathmaxrxt;



	/* Flag that path mtu update is pending */

	__u8   pmtu_pending;



	/* Association : The smallest PMTU discovered for all of the

	 * PMTU	       : peer's transport addresses.

	 */

net/ipv4/tcp_bic.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static int fast_convergence = 1; 
static int max_increment = 16;

static int low_window = 14;

static int beta = 819;		/* = 819/1024 (BICTCP_BETA_SCALE) */

static int initial_ssthresh = 100;

static int initial_ssthresh;

static int smooth_part = 20;



module_param(fast_convergence, int, 0644);

CRA Git | Maintained and supported by SUSTech CRA and CCSE