summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/8021q/vlan.h2
-rw-r--r--net/core/Makefile2
-rw-r--r--net/core/dev.c6
-rw-r--r--net/core/netfilter.c2
-rw-r--r--net/decnet/dn_dev.c4
-rw-r--r--net/ipv4/netfilter/ip_conntrack_core.c2
-rw-r--r--net/ipv4/netfilter/ip_conntrack_ftp.c2
-rw-r--r--net/ipv4/netfilter/ip_conntrack_irc.c4
-rw-r--r--net/ipv4/netfilter/ip_nat_core.c2
-rw-r--r--net/ipv4/netfilter/ip_nat_irc.c2
-rw-r--r--net/ipv4/tcp.c2
-rw-r--r--net/ipv6/ndisc.c2
-rw-r--r--net/ipx/af_ipx.c2
-rw-r--r--net/irda/irlmp_event.c2
-rw-r--r--net/irda/irsyms.c2
-rw-r--r--net/irda/irttp.c2
-rw-r--r--net/llc/af_llc.c2
-rw-r--r--net/llc/llc_pdu.c2
-rw-r--r--net/netsyms.c4
-rw-r--r--net/sched/sch_gred.c2
-rw-r--r--net/sched/sch_htb.c2
-rw-r--r--net/sctp/outqueue.c2
-rw-r--r--net/sctp/primitive.c2
-rw-r--r--net/sctp/sm_statefuns.c6
-rw-r--r--net/sctp/ulpevent.c2
-rw-r--r--net/socket.c4
-rw-r--r--net/sunrpc/auth_unix.c2
-rw-r--r--net/wanrouter/af_wanpipe.c4
28 files changed, 36 insertions, 38 deletions
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index bc89e879c379..b81d7f6b9238 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -38,7 +38,7 @@ int vlan_ioctl_handler(unsigned long arg);
extern struct vlan_group *vlan_group_hash[VLAN_GRP_HASH_SIZE];
extern spinlock_t vlan_group_lock;
-/* Find a VLAN device by the MAC address of it's Ethernet device, and
+/* Find a VLAN device by the MAC address of its Ethernet device, and
* it's VLAN ID. The default configuration is to have VLAN's scope
* to be box-wide, so the MAC will be ignored. The mac will only be
* looked at if we are configured to have a separate set of VLANs per
diff --git a/net/core/Makefile b/net/core/Makefile
index 2f8e73b7bbab..ffbb63e471a4 100644
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -19,5 +19,3 @@ obj-$(CONFIG_NET_DIVERT) += dv.o
obj-$(CONFIG_NET_PROFILE) += profile.o
obj-$(CONFIG_NET_PKTGEN) += pktgen.o
obj-$(CONFIG_NET_RADIO) += wireless.o
-# Ugly. I wish all wireless drivers were moved in drivers/net/wireless
-obj-$(CONFIG_NET_PCMCIA_RADIO) += wireless.o
diff --git a/net/core/dev.c b/net/core/dev.c
index 5535abdd4c3a..f7f9cd622e89 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -107,10 +107,10 @@
#include <linux/kmod.h>
#include <linux/module.h>
#include <linux/kallsyms.h>
-#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO)
+#ifdef CONFIG_NET_RADIO
#include <linux/wireless.h> /* Note : will define WIRELESS_EXT */
#include <net/iw_handler.h>
-#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
+#endif /* CONFIG_NET_RADIO */
#ifdef CONFIG_PLIP
extern int plip_init(void);
#endif
@@ -1215,7 +1215,7 @@ static void get_sample_stats(int cpu)
#ifdef OFFLINE_SAMPLE
static void sample_queue(unsigned long dummy)
{
-/* 10 ms 0r 1ms -- i dont care -- JHS */
+/* 10 ms 0r 1ms -- i don't care -- JHS */
int next_tick = 1;
int cpu = smp_processor_id();
diff --git a/net/core/netfilter.c b/net/core/netfilter.c
index 5cfc8f9be6af..a69f8cea7351 100644
--- a/net/core/netfilter.c
+++ b/net/core/netfilter.c
@@ -606,7 +606,7 @@ int ip_route_me_harder(struct sk_buff **pskb)
struct net_device *dev_src = NULL;
int err;
- /* accomodate ip_route_output_slow(), which expects the key src to be
+ /* accommodate ip_route_output_slow(), which expects the key src to be
0 or a local address; however some non-standard hacks like
ipt_REJECT.c:send_reset() can cause packets with foreign
saddr to be appear on the NF_IP_LOCAL_OUT hook -MB */
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 3dedfbb5dd87..776eb0afd9da 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -18,7 +18,7 @@
* Steve Whitehouse : Multiple ifaddr support
* Steve Whitehouse : SIOCGIFCONF is now a compile time option
* Steve Whitehouse : /proc/sys/net/decnet/conf/<sys>/forwarding
- * Steve Whitehouse : Removed timer1 - its a user space issue now
+ * Steve Whitehouse : Removed timer1 - it's a user space issue now
* Patrick Caulfield : Fixed router hello message format
*/
@@ -807,7 +807,7 @@ out:
* This is one of those areas where the initial VMS concepts don't really
* map onto the Linux concepts, and since we introduced multiple addresses
* per interface we have to cope with slightly odd ways of finding out what
- * "our address" really is. Mostly its not a problem; for this we just guess
+ * "our address" really is. Mostly it's not a problem; for this we just guess
* a sensible default. Eventually the routing code will take care of all the
* nasties for us I hope.
*/
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 2f357cbd7018..3ca4c96796a0 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -702,7 +702,7 @@ init_conntrack(const struct ip_conntrack_tuple *tuple,
if (!expected)
conntrack->helper = ip_ct_find_helper(&repl_tuple);
- /* If the expectation is dying, then this is a looser. */
+ /* If the expectation is dying, then this is a loser. */
if (expected
&& expected->expectant->helper->timeout
&& ! del_timer(&expected->timeout))
diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
index 9a5ff69d5f7e..4207bc101ed4 100644
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
@@ -321,7 +321,7 @@ static int help(const struct iphdr *iph, size_t len,
if (found == -1) {
/* We don't usually drop packets. After all, this is
connection tracking, not packet filtering.
- However, it is neccessary for accurate tracking in
+ However, it is necessary for accurate tracking in
this case. */
if (net_ratelimit())
printk("conntrack_ftp: partial %s %u+%u\n",
diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c
index 98adfbf6eaf9..ab4f6c0d8420 100644
--- a/net/ipv4/netfilter/ip_conntrack_irc.c
+++ b/net/ipv4/netfilter/ip_conntrack_irc.c
@@ -107,7 +107,7 @@ int parse_dcc(char *data, char *data_end, u_int32_t * ip, u_int16_t * port,
static int help(const struct iphdr *iph, size_t len,
struct ip_conntrack *ct, enum ip_conntrack_info ctinfo)
{
- /* tcplen not negative guarenteed by ip_conntrack_tcp.c */
+ /* tcplen not negative guaranteed by ip_conntrack_tcp.c */
struct tcphdr *tcph = (void *) iph + iph->ihl * 4;
const char *data = (const char *) tcph + tcph->doff * 4;
const char *_data = data;
@@ -199,7 +199,7 @@ static int help(const struct iphdr *iph, size_t len,
LOCK_BH(&ip_irc_lock);
/* save position of address in dcc string,
- * neccessary for NAT */
+ * necessary for NAT */
DEBUGP("tcph->seq = %u\n", tcph->seq);
exp->seq = ntohl(tcph->seq) + (addr_beg_p - _data);
exp_irc_info->len = (addr_end_p - addr_beg_p);
diff --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c
index 377a50121229..9028334c5112 100644
--- a/net/ipv4/netfilter/ip_nat_core.c
+++ b/net/ipv4/netfilter/ip_nat_core.c
@@ -288,7 +288,7 @@ find_best_ips_proto(struct ip_conntrack_tuple *tuple,
saved_ip = tuple->src.ip;
other_ipp = &tuple->src.ip;
}
- /* Don't do do_extra_mangle unless neccessary (overrides
+ /* Don't do do_extra_mangle unless necessary (overrides
explicit socket bindings, for example) */
orig_dstip = tuple->dst.ip;
diff --git a/net/ipv4/netfilter/ip_nat_irc.c b/net/ipv4/netfilter/ip_nat_irc.c
index 3edc319f56fb..50d0ec8d82f0 100644
--- a/net/ipv4/netfilter/ip_nat_irc.c
+++ b/net/ipv4/netfilter/ip_nat_irc.c
@@ -188,7 +188,7 @@ static unsigned int help(struct ip_conntrack *ct,
datalen = (*pskb)->len - iph->ihl * 4 - tcph->doff * 4;
LOCK_BH(&ip_irc_lock);
- /* Check wether the whole IP/address pattern is carried in the payload */
+ /* Check whether the whole IP/address pattern is carried in the payload */
if (between(exp->seq + ct_irc_info->len,
ntohl(tcph->seq),
ntohl(tcph->seq) + datalen)) {
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 2351b2faf180..d1e4db1262be 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -172,7 +172,7 @@
* ack if state is TCP_CLOSED.
* Alan Cox : Look up device on a retransmit - routes may
* change. Doesn't yet cope with MSS shrink right
- * but its a start!
+ * but it's a start!
* Marc Tamsky : Closing in closing fixes.
* Mike Shaver : RFC1122 verifications.
* Alan Cox : rcv_saddr errors.
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index ea9859dc5842..a200a7c9135e 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -208,7 +208,7 @@ struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len,
default:
/*
* Unknown options must be silently ignored,
- * to accomodate future extension to the protocol.
+ * to accommodate future extension to the protocol.
*/
ND_PRINTK2(KERN_WARNING
"ndisc_parse_options(): ignored unsupported option; type=%d, len=%d\n",
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 11f73d24393e..a577de58ff13 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -684,7 +684,7 @@ static int ipxitf_send(struct ipx_interface *intrfc, struct sk_buff *skb,
if (ipx->ipx_source.net != intrfc->if_netnum) {
/*
* Unshare the buffer before modifying the count in
- * case its a flood or tcpdump
+ * case it's a flood or tcpdump
*/
skb = skb_unshare(skb, GFP_ATOMIC);
if (!skb)
diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index 75320713724a..b09c1d898b0f 100644
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -423,7 +423,7 @@ static void irlmp_state_active(struct lap_cb *self, IRLMP_EVENT event,
/* We don't want to change state just yet, because
* we want to reflect accurately the real state of
* the LAP, not the state we wish it was in,
- * so that we don't loose LM_LAP_CONNECT_REQUEST.
+ * so that we don't lose LM_LAP_CONNECT_REQUEST.
* In some cases, IrLAP won't close the LAP
* immediately. For example, it might still be
* retrying packets or waiting for the pf bit.
diff --git a/net/irda/irsyms.c b/net/irda/irsyms.c
index 1cab9b806c89..ec7363528e14 100644
--- a/net/irda/irsyms.c
+++ b/net/irda/irsyms.c
@@ -254,7 +254,7 @@ void irda_notify_init(notify_t *notify)
/*
* Function irda_init (void)
*
- * Protocol stack intialisation entry point.
+ * Protocol stack initialisation entry point.
* Initialise the various components of the IrDA stack
*/
int __init irda_init(void)
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 749d0fe895f5..91b1b9ef71e4 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -710,7 +710,7 @@ static void irttp_run_tx_queue(struct tsap_cb *self)
* The current skb has a reference to the socket that sent
* it (skb->sk). When we pass it to IrLMP, the skb will be
* stored in in IrLAP (self->wx_list). When we are within
- * IrLAP, we loose the notion of socket, so we should not
+ * IrLAP, we lose the notion of socket, so we should not
* have a reference to a socket. So, we drop it here.
*
* Why does it matter ?
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 60fa3afa28b8..b52efba8a6f5 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -301,7 +301,7 @@ static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)
llc->daddr.lsap = addr->sllc_dsap;
memcpy(llc->daddr.mac, addr->sllc_dmac, IFHWADDRLEN);
memcpy(&llc->addr, addr, sizeof(llc->addr));
- /* assign new connection to it's SAP */
+ /* assign new connection to its SAP */
llc_sap_assign_sock(sap, sk);
rc = sk->zapped = 0;
out:
diff --git a/net/llc/llc_pdu.c b/net/llc/llc_pdu.c
index b5d047e9154f..8da9ddea65be 100644
--- a/net/llc/llc_pdu.c
+++ b/net/llc/llc_pdu.c
@@ -203,7 +203,7 @@ void llc_pdu_init_as_xid_cmd(struct sk_buff *skb, u8 svcs_supported,
xid_info = (struct llc_xid_info *)(((u8 *)&pdu->ctrl_1) + 1);
xid_info->fmt_id = LLC_XID_FMT_ID; /* 0x81 */
xid_info->type = svcs_supported;
- xid_info->rw = rx_window << 1; /* size of recieve window */
+ xid_info->rw = rx_window << 1; /* size of receive window */
skb_put(skb, 3);
}
diff --git a/net/netsyms.c b/net/netsyms.c
index 76c32e9baf93..6a11dd1ad537 100644
--- a/net/netsyms.c
+++ b/net/netsyms.c
@@ -646,12 +646,12 @@ EXPORT_SYMBOL(register_gifconf);
EXPORT_SYMBOL(softnet_data);
-#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO)
+#ifdef CONFIG_NET_RADIO
/* Don't include the whole header mess for a single function */
union iwreq_data;
extern void wireless_send_event(struct net_device *dev, unsigned int cmd, union iwreq_data *wrqu, char *extra);
EXPORT_SYMBOL(wireless_send_event);
-#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
+#endif /* CONFIG_NET_RADIO */
EXPORT_SYMBOL(linkwatch_fire_event);
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 6f653b5bb65d..d6162b24fe8f 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -416,7 +416,7 @@ static int gred_change(struct Qdisc *sch, struct rtattr *opt)
memcpy(q->Stab, RTA_DATA(tb[TCA_GRED_STAB-1]), 256);
if ( table->initd && table->grio) {
- /* this looks ugly but its not in the fast path */
+ /* this looks ugly but it's not in the fast path */
for (i=0;i<table->DPs;i++) {
if ((!table->tab[i]) || (i==q->DP) )
continue;
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index a99047e1792d..30f946968ba1 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -623,7 +623,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff)
if (new_mode == cl->cmode)
return;
- if (cl->prio_activity) { /* not neccessary: speed optimization */
+ if (cl->prio_activity) { /* not necessary: speed optimization */
if (cl->cmode != HTB_CANT_SEND)
htb_deactivate_prios(q,cl);
cl->cmode = new_mode;
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index b1bfe69e61ed..05580a524db7 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -423,7 +423,7 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, sctp_packet_t *pkt,
*start_timer = 1;
/* Stop sending DATA as there is no more room
- * at the reciever.
+ * at the receiver.
*/
list_add(lchunk, lqueue);
lchunk = NULL;
diff --git a/net/sctp/primitive.c b/net/sctp/primitive.c
index a77be1514941..a652c61a14e3 100644
--- a/net/sctp/primitive.c
+++ b/net/sctp/primitive.c
@@ -199,7 +199,7 @@ DECLARE_PRIMITIVE(SEND);
* o association id - local handle to the SCTP association
*
* o destination transport address - the transport address of the
- * asociation on which a heartbeat should be issued.
+ * association on which a heartbeat should be issued.
*/
DECLARE_PRIMITIVE(REQUESTHEARTBEAT);
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 848a48229f17..8ecbc89f6fe4 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -939,7 +939,7 @@ out:
return 0;
}
-/* A restart is occuring, check to make sure no new addresses
+/* A restart is occurring, check to make sure no new addresses
* are being added as we may be under a takeover attack.
*/
static int sctp_sf_check_restart_addrs(const sctp_association_t *new_asoc,
@@ -1413,7 +1413,7 @@ nomem:
* at about the same time but the peer endpoint started its INIT
* after responding to the local endpoint's INIT
*/
-/* This case represents an intialization collision. */
+/* This case represents an initialization collision. */
static sctp_disposition_t sctp_sf_do_dupcook_b(const sctp_endpoint_t *ep,
const sctp_association_t *asoc,
sctp_chunk_t *chunk,
@@ -3734,7 +3734,7 @@ sctp_disposition_t sctp_sf_shutdown_ack_sent_prm_abort(
* o association id - local handle to the SCTP association
*
* o destination transport address - the transport address of the
- * asociation on which a heartbeat should be issued.
+ * association on which a heartbeat should be issued.
*/
sctp_disposition_t sctp_sf_do_prm_requestheartbeat(
const sctp_endpoint_t *ep,
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index 4a368eb47073..020be17ba7bc 100644
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -785,7 +785,7 @@ static void sctp_rcvmsg_rfree(struct sk_buff *skb)
sctp_association_put(asoc);
}
-/* Charge receive window for bytes recieved. */
+/* Charge receive window for bytes received. */
static void sctp_ulpevent_set_owner_r(struct sk_buff *skb, sctp_association_t *asoc)
{
sctp_ulpevent_t *event;
diff --git a/net/socket.c b/net/socket.c
index 5e7636d1408a..9c65c518f8d7 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -83,9 +83,9 @@
#include <linux/kmod.h>
#endif
-#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO)
+#ifdef CONFIG_NET_RADIO
#include <linux/wireless.h> /* Note : will define WIRELESS_EXT */
-#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
+#endif /* CONFIG_NET_RADIO */
#include <asm/uaccess.h>
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index a5560fb1fc7f..93f02ef4b31a 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -163,7 +163,7 @@ unx_marshal(struct rpc_task *task, u32 *p, int ruid)
memcpy(p, clnt->cl_nodename, n);
p += (n + 3) >> 2;
- /* Note: we don't use real uid if it involves raising priviledge */
+ /* Note: we don't use real uid if it involves raising privilege */
if (ruid && cred->uc_puid != 0 && cred->uc_pgid != 0) {
*p++ = htonl((u32) cred->uc_puid);
*p++ = htonl((u32) cred->uc_pgid);
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c
index 0ff419cbe595..12f6dc507758 100644
--- a/net/wanrouter/af_wanpipe.c
+++ b/net/wanrouter/af_wanpipe.c
@@ -388,7 +388,7 @@ static int wanpipe_listen_rcv (struct sk_buff *skb, struct sock *sk)
/* Register the lcn on which incoming call came
* from. Thus, if we have to clear it, we know
- * whic lcn to clear
+ * which lcn to clear
*/
newwp->lcn = mbox_ptr->cmd.lcn;
@@ -674,7 +674,7 @@ out_unlock:
/*============================================================
* wanpipe_delayed_tarnsmit
*
- * Transmit bottom half handeler. It dequeues packets
+ * Transmit bottom half handler. It dequeues packets
* from sk->write_queue and passes them to the
* driver. If the driver is busy, the packet is
* re-enqueued.
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-28 00:39:14 +0000