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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)
  net: pack skb_shared_info more efficiently
  net_sched: red: split red_parms into parms and vars
  net_sched: sfq: extend limits
  cnic: Improve error recovery on bnx2x devices
  cnic: Re-init dev->stats_addr after chip reset
  net_sched: Bug in netem reordering
  bna: fix sparse warnings/errors
  bna: make ethtool_ops and strings const
  xgmac: cleanups
  net: make ethtool_ops const
  vmxnet3" make ethtool ops const
  xen-netback: make ops structs const
  virtio_net: Pass gfp flags when allocating rx buffers.
  ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call
  netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call
  igb: reset PHY after recovering from PHY power down
  igb: add basic runtime PM support
  igb: Add support for byte queue limits.
  e1000: cleanup CE4100 MDIO registers access
  e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
index f99cfce7ca97..c3126e864f3c 100644
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
@@ -195,7 +195,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
                 sp = rxrpc_skb(txb);
 
                 if (sp->need_resend) {
-                        sp->need_resend = 0;
+                        sp->need_resend = false;
 
                         /* each Tx packet has a new serial number */
                         sp->hdr.serial =
@@ -216,7 +216,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
                 }
 
                 if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         resend |= 1;
                 } else if (resend & 2) {
                         if (time_before(sp->resend_at, resend_at))
@@ -265,7 +265,7 @@ static void rxrpc_resend_timer(struct rxrpc_call *call)
                 if (sp->need_resend) {
                         ;
                 } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         resend |= 1;
                 } else if (resend & 2) {
                         if (time_before(sp->resend_at, resend_at))
@@ -314,11 +314,11 @@ static int rxrpc_process_soft_ACKs(struct rxrpc_call *call,
 
                 switch (sacks[loop]) {
                 case RXRPC_ACK_TYPE_ACK:
-                        sp->need_resend = 0;
+                        sp->need_resend = false;
                         *p_txb |= 1;
                         break;
                 case RXRPC_ACK_TYPE_NACK:
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         *p_txb &= ~1;
                         resend = 1;
                         break;
@@ -344,13 +344,13 @@ static int rxrpc_process_soft_ACKs(struct rxrpc_call *call,
 
                 if (*p_txb & 1) {
                         /* packet must have been discarded */
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         *p_txb &= ~1;
                         resend |= 1;
                 } else if (sp->need_resend) {
                         ;
                 } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         resend |= 1;
                 } else if (resend & 2) {
                         if (time_before(sp->resend_at, resend_at))