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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)
  [IPV4]: OOPS with NETLINK_FIB_LOOKUP netlink socket
  [NET]: Fix function put_cmsg() which may cause usr application memory overflow
  [ATM]: Spelling fixes
  [NETFILTER] ipv4: Spelling fixes
  [NETFILTER]: Spelling fixes
  [SCTP]: Spelling fixes
  [NETLABEL]: Spelling fixes
  [PKT_SCHED]: Spelling fixes
  [NET] net/core/: Spelling fixes
  [IPV6]: Spelling fixes
  [IRDA]: Spelling fixes
  [DCCP]: Spelling fixes
  [NET] include/net/: Spelling fixes
  [NET]: Correct two mistaken skb_reset_mac_header() conversions.
  [IPV4] ip_gre: set mac_header correctly in receive path
  [XFRM]: Audit function arguments misordered
  [IPSEC]: Avoid undefined shift operation when testing algorithm ID
  [IPV4] ARP: Remove not used code
  [TG3]: Endianness bugfix.
  [TG3]: Endianness annotations.
  ...

4 files changed, 6 insertions, 6 deletions

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 4e3cd93f81fc..32a57e1dee3a 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -35,7 +35,7 @@
 #define AX25_P_ATALK                    0xca    /* Appletalk                  */
 #define AX25_P_ATALK_ARP                0xcb    /* Appletalk ARP              */
 #define AX25_P_IP                       0xcc    /* ARPA Internet Protocol     */
-#define AX25_P_ARP                      0xcd    /* ARPA Adress Resolution     */
+#define AX25_P_ARP                      0xcd    /* ARPA Address Resolution    */
 #define AX25_P_FLEXNET                  0xce    /* FlexNet                    */
 #define AX25_P_NETROM                   0xcf    /* NET/ROM                    */
 #define AX25_P_TEXT                     0xF0    /* No layer 3 protocol impl.  */
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 29c9da707c7a..c17fa1fdc356 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -23,7 +23,7 @@ struct ip6_tnl {
         struct net_device *dev; /* virtual device associated with tunnel */
         struct net_device_stats stat;   /* statistics for tunnel device */
         int recursion;          /* depth of hard_start_xmit recursion */
-        struct ip6_tnl_parm parms;      /* tunnel configuration paramters */
+        struct ip6_tnl_parm parms;      /* tunnel configuration parameters */
         struct flowi fl;        /* flowi template for xmit */
         struct dst_entry *dst_cache;    /* cached dst */
         u32 dst_cookie;
diff --git a/include/net/irda/discovery.h b/include/net/irda/discovery.h
index eb0f9de47294..e4efad1f9eff 100644
--- a/include/net/irda/discovery.h
+++ b/include/net/irda/discovery.h
@@ -80,7 +80,7 @@ typedef struct discovery_t {
         irda_queue_t    q;              /* Must be first! */
 
         discinfo_t      data;           /* Basic discovery information */
-        int             name_len;       /* Lenght of nickname */
+        int             name_len;       /* Length of nickname */
 
         LAP_REASON      condition;      /* More info about the discovery */
         int             gen_addr_bit;   /* Need to generate a new device
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 002a00a4e6be..bb965742b64e 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -301,7 +301,7 @@ struct sctp_sock {
         /* The default SACK delay timeout for new associations. */
         __u32 sackdelay;
 
-        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
+        /* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */
         __u32 param_flags;
 
         struct sctp_initmsg initmsg;
@@ -955,7 +955,7 @@ struct sctp_transport {
         /* PMTU       : The current known path MTU.  */
         __u32 pathmtu;
 
-        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
+        /* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */
         __u32 param_flags;
 
         /* The number of times INIT has been sent on this transport. */
@@ -1638,7 +1638,7 @@ struct sctp_association {
          */
         __u32 pathmtu;
 
-        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
+        /* Flags controlling Heartbeat, SACK delay, and Path MTU Discovery. */
         __u32 param_flags;
 
         /* SACK delay timeout */