diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/hci_core.c | 2 | ||||
-rw-r--r-- | net/caif/cfcnfg.c | 2 | ||||
-rw-r--r-- | net/irda/timer.c | 2 | ||||
-rw-r--r-- | net/sctp/sm_make_chunk.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 22e77a786545..60793e7b768b 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1929,7 +1929,7 @@ int hci_recv_frame(struct sk_buff *skb) | |||
1929 | return -ENXIO; | 1929 | return -ENXIO; |
1930 | } | 1930 | } |
1931 | 1931 | ||
1932 | /* Incomming skb */ | 1932 | /* Incoming skb */ |
1933 | bt_cb(skb)->incoming = 1; | 1933 | bt_cb(skb)->incoming = 1; |
1934 | 1934 | ||
1935 | /* Time stamp */ | 1935 | /* Time stamp */ |
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index ba9cfd47778a..f1dbddb95a6c 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c | |||
@@ -402,7 +402,7 @@ cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, enum cfctrl_srv serv, | |||
402 | 402 | ||
403 | phyinfo = cfcnfg_get_phyinfo_rcu(cnfg, phyid); | 403 | phyinfo = cfcnfg_get_phyinfo_rcu(cnfg, phyid); |
404 | if (phyinfo == NULL) { | 404 | if (phyinfo == NULL) { |
405 | pr_err("ERROR: Link Layer Device dissapeared" | 405 | pr_err("ERROR: Link Layer Device disappeared" |
406 | "while connecting\n"); | 406 | "while connecting\n"); |
407 | goto unlock; | 407 | goto unlock; |
408 | } | 408 | } |
diff --git a/net/irda/timer.c b/net/irda/timer.c index 1d552b3946fc..0c4c115a5cab 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c | |||
@@ -57,7 +57,7 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s) | |||
57 | * Basically, we multiply the number of remaining slots by our | 57 | * Basically, we multiply the number of remaining slots by our |
58 | * slot time, plus add some extra time to properly receive the last | 58 | * slot time, plus add some extra time to properly receive the last |
59 | * discovery packet (which is longer due to extra discovery info), | 59 | * discovery packet (which is longer due to extra discovery info), |
60 | * to avoid messing with for incomming connections requests and | 60 | * to avoid messing with for incoming connections requests and |
61 | * to accommodate devices that perform discovery slower than us. | 61 | * to accommodate devices that perform discovery slower than us. |
62 | * Jean II */ | 62 | * Jean II */ |
63 | timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) | 63 | timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index a193f3bc8144..cf579e71cff0 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -1201,7 +1201,7 @@ nodata: | |||
1201 | * specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) | 1201 | * specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) |
1202 | * This is a helper function to allocate an error chunk for | 1202 | * This is a helper function to allocate an error chunk for |
1203 | * for those invalid parameter codes in which we may not want | 1203 | * for those invalid parameter codes in which we may not want |
1204 | * to report all the errors, if the incomming chunk is large | 1204 | * to report all the errors, if the incoming chunk is large |
1205 | */ | 1205 | */ |
1206 | static inline struct sctp_chunk *sctp_make_op_error_fixed( | 1206 | static inline struct sctp_chunk *sctp_make_op_error_fixed( |
1207 | const struct sctp_association *asoc, | 1207 | const struct sctp_association *asoc, |