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.

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
index d5bdd2574659..5ae80bbe2edc 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -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 */