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: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.

1 files changed, 36 insertions, 49 deletions

diff --git a/net/can/bcm.c b/net/can/bcm.c
index 72720c710351..597da4f8f888 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -46,6 +46,7 @@
 #include <linux/hrtimer.h>
 #include <linux/list.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/uio.h>
 #include <linux/net.h>
 #include <linux/netdevice.h>
@@ -146,23 +147,18 @@ static char *bcm_proc_getifname(int ifindex)
         return "???";
 }
 
-static int bcm_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data)
+static int bcm_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0;
-        struct sock *sk = (struct sock *)data;
+        struct sock *sk = (struct sock *)m->private;
         struct bcm_sock *bo = bcm_sk(sk);
         struct bcm_op *op;
 
-        len += snprintf(page + len, PAGE_SIZE - len, ">>> socket %p",
-                        sk->sk_socket);
-        len += snprintf(page + len, PAGE_SIZE - len, " / sk %p", sk);
-        len += snprintf(page + len, PAGE_SIZE - len, " / bo %p", bo);
-        len += snprintf(page + len, PAGE_SIZE - len, " / dropped %lu",
-                        bo->dropped_usr_msgs);
-        len += snprintf(page + len, PAGE_SIZE - len, " / bound %s",
-                        bcm_proc_getifname(bo->ifindex));
-        len += snprintf(page + len, PAGE_SIZE - len, " <<<\n");
+        seq_printf(m, ">>> socket %p", sk->sk_socket);
+        seq_printf(m, " / sk %p", sk);
+        seq_printf(m, " / bo %p", bo);
+        seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
+        seq_printf(m, " / bound %s", bcm_proc_getifname(bo->ifindex));
+        seq_printf(m, " <<<\n");
 
         list_for_each_entry(op, &bo->rx_ops, list) {
 
@@ -172,71 +168,62 @@ static int bcm_read_proc(char *page, char **start, off_t off,
                 if (!op->frames_abs)
                         continue;
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                "rx_op: %03X %-5s ",
+                seq_printf(m, "rx_op: %03X %-5s ",
                                 op->can_id, bcm_proc_getifname(op->ifindex));
-                len += snprintf(page + len, PAGE_SIZE - len, "[%d]%c ",
-                                op->nframes,
+                seq_printf(m, "[%d]%c ", op->nframes,
                                 (op->flags & RX_CHECK_DLC)?'d':' ');
                 if (op->kt_ival1.tv64)
-                        len += snprintf(page + len, PAGE_SIZE - len,
-                                        "timeo=%lld ",
+                        seq_printf(m, "timeo=%lld ",
                                         (long long)
                                         ktime_to_us(op->kt_ival1));
 
                 if (op->kt_ival2.tv64)
-                        len += snprintf(page + len, PAGE_SIZE - len,
-                                        "thr=%lld ",
+                        seq_printf(m, "thr=%lld ",
                                         (long long)
                                         ktime_to_us(op->kt_ival2));
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                "# recv %ld (%ld) => reduction: ",
+                seq_printf(m, "# recv %ld (%ld) => reduction: ",
                                 op->frames_filtered, op->frames_abs);
 
                 reduction = 100 - (op->frames_filtered * 100) / op->frames_abs;
 
-                len += snprintf(page + len, PAGE_SIZE - len, "%s%ld%%\n",
+                seq_printf(m, "%s%ld%%\n",
                                 (reduction == 100)?"near ":"", reduction);
-
-                if (len > PAGE_SIZE - 200) {
-                        /* mark output cut off */
-                        len += snprintf(page + len, PAGE_SIZE - len, "(..)\n");
-                        break;
-                }
         }
 
         list_for_each_entry(op, &bo->tx_ops, list) {
 
-                len += snprintf(page + len, PAGE_SIZE - len,
-                                "tx_op: %03X %s [%d] ",
+                seq_printf(m, "tx_op: %03X %s [%d] ",
                                 op->can_id, bcm_proc_getifname(op->ifindex),
                                 op->nframes);
 
                 if (op->kt_ival1.tv64)
-                        len += snprintf(page + len, PAGE_SIZE - len, "t1=%lld ",
+                        seq_printf(m, "t1=%lld ",
                                         (long long) ktime_to_us(op->kt_ival1));
 
                 if (op->kt_ival2.tv64)
-                        len += snprintf(page + len, PAGE_SIZE - len, "t2=%lld ",
+                        seq_printf(m, "t2=%lld ",
                                         (long long) ktime_to_us(op->kt_ival2));
 
-                len += snprintf(page + len, PAGE_SIZE - len, "# sent %ld\n",
-                                op->frames_abs);
-
-                if (len > PAGE_SIZE - 100) {
-                        /* mark output cut off */
-                        len += snprintf(page + len, PAGE_SIZE - len, "(..)\n");
-                        break;
-                }
+                seq_printf(m, "# sent %ld\n", op->frames_abs);
         }
+        seq_putc(m, '\n');
+        return 0;
+}
 
-        len += snprintf(page + len, PAGE_SIZE - len, "\n");
-
-        *eof = 1;
-        return len;
+static int bcm_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, bcm_proc_show, PDE(inode)->data);
 }
 
+static const struct file_operations bcm_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = bcm_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*
  * bcm_can_tx - send the (next) CAN frame to the appropriate CAN interface
  *              of the given bcm tx op
@@ -1515,9 +1502,9 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
         if (proc_dir) {
                 /* unique socket address as filename */
                 sprintf(bo->procname, "%p", sock);
-                bo->bcm_proc_read = create_proc_read_entry(bo->procname, 0644,
-                                                           proc_dir,
-                                                           bcm_read_proc, sk);
+                bo->bcm_proc_read = proc_create_data(bo->procname, 0644,
+                                                     proc_dir,
+                                                     &bcm_proc_fops, sk);
         }
 
         return 0;