diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/bnep/core.c | 4 | ||||
-rw-r--r-- | net/ipv4/netfilter/ipt_ECN.c | 2 | ||||
-rw-r--r-- | net/irda/irlap.c | 14 | ||||
-rw-r--r-- | net/irda/irlap_event.c | 2 | ||||
-rw-r--r-- | net/irda/irlmp.c | 4 | ||||
-rw-r--r-- | net/mac80211/mesh_pathtbl.c | 4 | ||||
-rw-r--r-- | net/netlabel/netlabel_domainhash.c | 2 | ||||
-rw-r--r-- | net/sched/act_api.c | 2 | ||||
-rw-r--r-- | net/sctp/sm_sideeffect.c | 2 | ||||
-rw-r--r-- | net/sctp/sm_statefuns.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 | ||||
-rw-r--r-- | net/wimax/op-reset.c | 2 |
12 files changed, 21 insertions, 21 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 29b1b220d6cf..ef09c7b3a858 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
@@ -78,7 +78,7 @@ static struct bnep_session *__bnep_get_session(u8 *dst) | |||
78 | static void __bnep_link_session(struct bnep_session *s) | 78 | static void __bnep_link_session(struct bnep_session *s) |
79 | { | 79 | { |
80 | /* It's safe to call __module_get() here because sessions are added | 80 | /* It's safe to call __module_get() here because sessions are added |
81 | by the socket layer which has to hold the refference to this module. | 81 | by the socket layer which has to hold the reference to this module. |
82 | */ | 82 | */ |
83 | __module_get(THIS_MODULE); | 83 | __module_get(THIS_MODULE); |
84 | list_add(&s->list, &bnep_session_list); | 84 | list_add(&s->list, &bnep_session_list); |
@@ -632,7 +632,7 @@ int bnep_del_connection(struct bnep_conndel_req *req) | |||
632 | s = __bnep_get_session(req->dst); | 632 | s = __bnep_get_session(req->dst); |
633 | if (s) { | 633 | if (s) { |
634 | /* Wakeup user-space which is polling for socket errors. | 634 | /* Wakeup user-space which is polling for socket errors. |
635 | * This is temporary hack untill we have shutdown in L2CAP */ | 635 | * This is temporary hack until we have shutdown in L2CAP */ |
636 | s->sock->sk->sk_err = EUNATCH; | 636 | s->sock->sk->sk_err = EUNATCH; |
637 | 637 | ||
638 | /* Kill session thread */ | 638 | /* Kill session thread */ |
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c index 549e206cdd42..ea5cea2415c1 100644 --- a/net/ipv4/netfilter/ipt_ECN.c +++ b/net/ipv4/netfilter/ipt_ECN.c | |||
@@ -50,7 +50,7 @@ set_ect_tcp(struct sk_buff *skb, const struct ipt_ECN_info *einfo) | |||
50 | struct tcphdr _tcph, *tcph; | 50 | struct tcphdr _tcph, *tcph; |
51 | __be16 oldval; | 51 | __be16 oldval; |
52 | 52 | ||
53 | /* Not enought header? */ | 53 | /* Not enough header? */ |
54 | tcph = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(_tcph), &_tcph); | 54 | tcph = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(_tcph), &_tcph); |
55 | if (!tcph) | 55 | if (!tcph) |
56 | return false; | 56 | return false; |
diff --git a/net/irda/irlap.c b/net/irda/irlap.c index 356e65b1dc42..783c5f367d29 100644 --- a/net/irda/irlap.c +++ b/net/irda/irlap.c | |||
@@ -450,10 +450,10 @@ void irlap_disconnect_request(struct irlap_cb *self) | |||
450 | 450 | ||
451 | /* Check if we are in the right state for disconnecting */ | 451 | /* Check if we are in the right state for disconnecting */ |
452 | switch (self->state) { | 452 | switch (self->state) { |
453 | case LAP_XMIT_P: /* FALLTROUGH */ | 453 | case LAP_XMIT_P: /* FALLTHROUGH */ |
454 | case LAP_XMIT_S: /* FALLTROUGH */ | 454 | case LAP_XMIT_S: /* FALLTHROUGH */ |
455 | case LAP_CONN: /* FALLTROUGH */ | 455 | case LAP_CONN: /* FALLTHROUGH */ |
456 | case LAP_RESET_WAIT: /* FALLTROUGH */ | 456 | case LAP_RESET_WAIT: /* FALLTHROUGH */ |
457 | case LAP_RESET_CHECK: | 457 | case LAP_RESET_CHECK: |
458 | irlap_do_event(self, DISCONNECT_REQUEST, NULL, NULL); | 458 | irlap_do_event(self, DISCONNECT_REQUEST, NULL, NULL); |
459 | break; | 459 | break; |
@@ -485,9 +485,9 @@ void irlap_disconnect_indication(struct irlap_cb *self, LAP_REASON reason) | |||
485 | IRDA_DEBUG(1, "%s(), Sending reset request!\n", __func__); | 485 | IRDA_DEBUG(1, "%s(), Sending reset request!\n", __func__); |
486 | irlap_do_event(self, RESET_REQUEST, NULL, NULL); | 486 | irlap_do_event(self, RESET_REQUEST, NULL, NULL); |
487 | break; | 487 | break; |
488 | case LAP_NO_RESPONSE: /* FALLTROUGH */ | 488 | case LAP_NO_RESPONSE: /* FALLTHROUGH */ |
489 | case LAP_DISC_INDICATION: /* FALLTROUGH */ | 489 | case LAP_DISC_INDICATION: /* FALLTHROUGH */ |
490 | case LAP_FOUND_NONE: /* FALLTROUGH */ | 490 | case LAP_FOUND_NONE: /* FALLTHROUGH */ |
491 | case LAP_MEDIA_BUSY: | 491 | case LAP_MEDIA_BUSY: |
492 | irlmp_link_disconnect_indication(self->notify.instance, self, | 492 | irlmp_link_disconnect_indication(self->notify.instance, self, |
493 | reason, NULL); | 493 | reason, NULL); |
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c index c5c51959e3ce..94a9884d7146 100644 --- a/net/irda/irlap_event.c +++ b/net/irda/irlap_event.c | |||
@@ -1741,7 +1741,7 @@ static int irlap_state_reset(struct irlap_cb *self, IRLAP_EVENT event, | |||
1741 | * Function irlap_state_xmit_s (event, skb, info) | 1741 | * Function irlap_state_xmit_s (event, skb, info) |
1742 | * | 1742 | * |
1743 | * XMIT_S, The secondary station has been given the right to transmit, | 1743 | * XMIT_S, The secondary station has been given the right to transmit, |
1744 | * and we therefor do not expect to receive any transmissions from other | 1744 | * and we therefore do not expect to receive any transmissions from other |
1745 | * stations. | 1745 | * stations. |
1746 | */ | 1746 | */ |
1747 | static int irlap_state_xmit_s(struct irlap_cb *self, IRLAP_EVENT event, | 1747 | static int irlap_state_xmit_s(struct irlap_cb *self, IRLAP_EVENT event, |
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index 7bf5b913828b..0e7d8bde145d 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c | |||
@@ -105,7 +105,7 @@ int __init irlmp_init(void) | |||
105 | 105 | ||
106 | init_timer(&irlmp->discovery_timer); | 106 | init_timer(&irlmp->discovery_timer); |
107 | 107 | ||
108 | /* Do discovery every 3 seconds, conditionaly */ | 108 | /* Do discovery every 3 seconds, conditionally */ |
109 | if (sysctl_discovery) | 109 | if (sysctl_discovery) |
110 | irlmp_start_discovery_timer(irlmp, | 110 | irlmp_start_discovery_timer(irlmp, |
111 | sysctl_discovery_timeout*HZ); | 111 | sysctl_discovery_timeout*HZ); |
@@ -1842,7 +1842,7 @@ LM_REASON irlmp_convert_lap_reason( LAP_REASON lap_reason) | |||
1842 | reason = LM_CONNECT_FAILURE; | 1842 | reason = LM_CONNECT_FAILURE; |
1843 | break; | 1843 | break; |
1844 | default: | 1844 | default: |
1845 | IRDA_DEBUG(1, "%s(), Unknow IrLAP disconnect reason %d!\n", | 1845 | IRDA_DEBUG(1, "%s(), Unknown IrLAP disconnect reason %d!\n", |
1846 | __func__, lap_reason); | 1846 | __func__, lap_reason); |
1847 | reason = LM_LAP_DISCONNECT; | 1847 | reason = LM_LAP_DISCONNECT; |
1848 | break; | 1848 | break; |
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index a8da23905c70..0192cfdacae4 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c | |||
@@ -244,7 +244,7 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct ieee80211_sub_if_data | |||
244 | * @addr: destination address of the path (ETH_ALEN length) | 244 | * @addr: destination address of the path (ETH_ALEN length) |
245 | * @sdata: local subif | 245 | * @sdata: local subif |
246 | * | 246 | * |
247 | * Returns: 0 on sucess | 247 | * Returns: 0 on success |
248 | * | 248 | * |
249 | * State: the initial state of the new path is set to 0 | 249 | * State: the initial state of the new path is set to 0 |
250 | */ | 250 | */ |
@@ -532,7 +532,7 @@ static void mesh_path_node_reclaim(struct rcu_head *rp) | |||
532 | * @addr: dst address (ETH_ALEN length) | 532 | * @addr: dst address (ETH_ALEN length) |
533 | * @sdata: local subif | 533 | * @sdata: local subif |
534 | * | 534 | * |
535 | * Returns: 0 if succesful | 535 | * Returns: 0 if successful |
536 | */ | 536 | */ |
537 | int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) | 537 | int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) |
538 | { | 538 | { |
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c index 7a10bbe02c13..c5d9f97ef217 100644 --- a/net/netlabel/netlabel_domainhash.c +++ b/net/netlabel/netlabel_domainhash.c | |||
@@ -682,7 +682,7 @@ struct netlbl_domaddr6_map *netlbl_domhsh_getentry_af6(const char *domain, | |||
682 | * buckets and @skip_chain entries. For each entry in the table call | 682 | * buckets and @skip_chain entries. For each entry in the table call |
683 | * @callback, if @callback returns a negative value stop 'walking' through the | 683 | * @callback, if @callback returns a negative value stop 'walking' through the |
684 | * table and return. Updates the values in @skip_bkt and @skip_chain on | 684 | * table and return. Updates the values in @skip_bkt and @skip_chain on |
685 | * return. Returns zero on succcess, negative values on failure. | 685 | * return. Returns zero on success, negative values on failure. |
686 | * | 686 | * |
687 | */ | 687 | */ |
688 | int netlbl_domhsh_walk(u32 *skip_bkt, | 688 | int netlbl_domhsh_walk(u32 *skip_bkt, |
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 2a740035aa6b..64f5e328cee9 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
@@ -598,7 +598,7 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a, | |||
598 | goto errout; | 598 | goto errout; |
599 | 599 | ||
600 | /* compat_mode being true specifies a call that is supposed | 600 | /* compat_mode being true specifies a call that is supposed |
601 | * to add additional backward compatiblity statistic TLVs. | 601 | * to add additional backward compatibility statistic TLVs. |
602 | */ | 602 | */ |
603 | if (compat_mode) { | 603 | if (compat_mode) { |
604 | if (a->type == TCA_OLD_COMPAT) | 604 | if (a->type == TCA_OLD_COMPAT) |
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index d771cc1b777a..4e4ca65cd320 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
@@ -717,7 +717,7 @@ static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds, | |||
717 | 717 | ||
718 | if (sctp_style(sk, TCP)) { | 718 | if (sctp_style(sk, TCP)) { |
719 | /* Change the sk->sk_state of a TCP-style socket that has | 719 | /* Change the sk->sk_state of a TCP-style socket that has |
720 | * sucessfully completed a connect() call. | 720 | * successfully completed a connect() call. |
721 | */ | 721 | */ |
722 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) | 722 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) |
723 | sk->sk_state = SCTP_SS_ESTABLISHED; | 723 | sk->sk_state = SCTP_SS_ESTABLISHED; |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 1ef9de9bbae9..47bc20d3a85b 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -3577,7 +3577,7 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep, | |||
3577 | * To do this properly, we'll set the destination address of the chunk | 3577 | * To do this properly, we'll set the destination address of the chunk |
3578 | * and at the transmit time, will try look up the transport to use. | 3578 | * and at the transmit time, will try look up the transport to use. |
3579 | * Since ASCONFs may be bundled, the correct transport may not be | 3579 | * Since ASCONFs may be bundled, the correct transport may not be |
3580 | * created untill we process the entire packet, thus this workaround. | 3580 | * created until we process the entire packet, thus this workaround. |
3581 | */ | 3581 | */ |
3582 | asconf_ack->dest = chunk->source; | 3582 | asconf_ack->dest = chunk->source; |
3583 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack)); | 3583 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack)); |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index f11be72a1a80..b15e1ebb2bfa 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c | |||
@@ -54,7 +54,7 @@ | |||
54 | * Assumptions: | 54 | * Assumptions: |
55 | * - head[0] is physically contiguous. | 55 | * - head[0] is physically contiguous. |
56 | * - tail[0] is physically contiguous. | 56 | * - tail[0] is physically contiguous. |
57 | * - pages[] is not physically or virtually contigous and consists of | 57 | * - pages[] is not physically or virtually contiguous and consists of |
58 | * PAGE_SIZE elements. | 58 | * PAGE_SIZE elements. |
59 | * | 59 | * |
60 | * Output: | 60 | * Output: |
diff --git a/net/wimax/op-reset.c b/net/wimax/op-reset.c index ca269178c4d4..35f370091f4f 100644 --- a/net/wimax/op-reset.c +++ b/net/wimax/op-reset.c | |||
@@ -62,7 +62,7 @@ | |||
62 | * Called when wanting to reset the device for any reason. Device is | 62 | * Called when wanting to reset the device for any reason. Device is |
63 | * taken back to power on status. | 63 | * taken back to power on status. |
64 | * | 64 | * |
65 | * This call blocks; on succesful return, the device has completed the | 65 | * This call blocks; on successful return, the device has completed the |
66 | * reset process and is ready to operate. | 66 | * reset process and is ready to operate. |
67 | */ | 67 | */ |
68 | int wimax_reset(struct wimax_dev *wimax_dev) | 68 | int wimax_reset(struct wimax_dev *wimax_dev) |