aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
commit9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch)
tree15c4222de2a2b2814c9430dcb4e997b18597881c /net
parent7c2db36e730ee4facd341679ecb21ee73ba92831 (diff)
parentdf63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_core.c2
-rw-r--r--net/caif/cfcnfg.c2
-rw-r--r--net/irda/timer.c2
-rw-r--r--net/sctp/sm_make_chunk.c2
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 */
1206static inline struct sctp_chunk *sctp_make_op_error_fixed( 1206static inline struct sctp_chunk *sctp_make_op_error_fixed(
1207 const struct sctp_association *asoc, 1207 const struct sctp_association *asoc,