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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck

1 files changed, 7 insertions, 7 deletions

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index fd9d06f291dc..da0f64f82b57 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -330,8 +330,7 @@ void ax25_destroy_socket(ax25_cb *ax25)
         }
 
         if (ax25->sk != NULL) {
-                if (atomic_read(&ax25->sk->sk_wmem_alloc) ||
-                    atomic_read(&ax25->sk->sk_rmem_alloc)) {
+                if (sk_has_allocations(ax25->sk)) {
                         /* Defer: outstanding buffers */
                         setup_timer(&ax25->dtimer, ax25_destroy_timer,
                                         (unsigned long)ax25);
@@ -1691,7 +1690,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         switch (cmd) {
         case TIOCOUTQ: {
                 long amount;
-                amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
+
+                amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
                 if (amount < 0)
                         amount = 0;
                 res = put_user(amount, (int __user *)argp);
@@ -1781,8 +1781,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 ax25_info.idletimer = ax25_display_timer(&ax25->idletimer) / (60 * HZ);
                 ax25_info.n2count   = ax25->n2count;
                 ax25_info.state     = ax25->state;
-                ax25_info.rcv_q     = atomic_read(&sk->sk_rmem_alloc);
-                ax25_info.snd_q     = atomic_read(&sk->sk_wmem_alloc);
+                ax25_info.rcv_q     = sk_wmem_alloc_get(sk);
+                ax25_info.snd_q     = sk_rmem_alloc_get(sk);
                 ax25_info.vs        = ax25->vs;
                 ax25_info.vr        = ax25->vr;
                 ax25_info.va        = ax25->va;
@@ -1922,8 +1922,8 @@ static int ax25_info_show(struct seq_file *seq, void *v)
 
         if (ax25->sk != NULL) {
                 seq_printf(seq, " %d %d %lu\n",
-                           atomic_read(&ax25->sk->sk_wmem_alloc),
-                           atomic_read(&ax25->sk->sk_rmem_alloc),
+                           sk_wmem_alloc_get(ax25->sk),
+                           sk_rmem_alloc_get(ax25->sk),
                            sock_i_ino(ax25->sk));
         } else {
                 seq_puts(seq, " * * *\n");