From 78cc8dfce4a0d0906dda6d1e0913789e66c7b8c5 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Thu, 20 Dec 2007 13:56:32 -0800 Subject: [PATCH] --- yaml --- r: 75133 b: refs/heads/master c: f4ab2f72e9340207ae95e2a7622a74220a61f46a h: refs/heads/master i: 75131: 4fc2808ca793e7ebd2ad3b2a47dc95d19350bd37 v: v3 --- [refs] | 2 +- trunk/include/net/ax25.h | 2 +- trunk/include/net/ip6_tunnel.h | 2 +- trunk/include/net/irda/discovery.h | 2 +- trunk/include/net/sctp/structs.h | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2c2a2313a6c1..198a8e933b6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6e6ca712b5cc06a662f900c0484d49d7334af64 +refs/heads/master: f4ab2f72e9340207ae95e2a7622a74220a61f46a diff --git a/trunk/include/net/ax25.h b/trunk/include/net/ax25.h index 4e3cd93f81fc..32a57e1dee3a 100644 --- a/trunk/include/net/ax25.h +++ b/trunk/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/trunk/include/net/ip6_tunnel.h b/trunk/include/net/ip6_tunnel.h index 29c9da707c7a..c17fa1fdc356 100644 --- a/trunk/include/net/ip6_tunnel.h +++ b/trunk/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/trunk/include/net/irda/discovery.h b/trunk/include/net/irda/discovery.h index eb0f9de47294..e4efad1f9eff 100644 --- a/trunk/include/net/irda/discovery.h +++ b/trunk/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/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h index 002a00a4e6be..bb965742b64e 100644 --- a/trunk/include/net/sctp/structs.h +++ b/trunk/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 */