staging:octeon Fix typos in staging:octeon

The below patch is a resend to fix some typos and comments that
I have found while reading.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 400df8cbee538b55a50e7baa92ceb18cae9e28c5..5699e6f1b5ba58021a6596a614418f6d72be985e 100644 (file)
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -162,7 +162,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)
                /*
                 * We received a packet with either an alignment error
                 * or a FCS error. This may be signalling that we are
-                * running 10Mbps with GMXX_RXX_FRM_CTL[PRE_CHK}
+                * running 10Mbps with GMXX_RXX_FRM_CTL[PRE_CHK]
                 * off. If this is the case we need to parse the
                 * packet to determine if we can remove a non spec
                 * preamble and generate a correct packet.

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 56d74dc2fbd5b5f3b7122371554d51647b5effb9..445cdba24b3fd866100ceab6bb01dcec2679fadb 100644 (file)
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -61,7 +61,7 @@
  * You can define GET_SKBUFF_QOS() to override how the skbuff output
  * function determines which output queue is used. The default
  * implementation always uses the base queue for the port. If, for
- * example, you wanted to use the skb->priority fieid, define
+ * example, you wanted to use the skb->priority field, define
  * GET_SKBUFF_QOS as: #define GET_SKBUFF_QOS(skb) ((skb)->priority)
  */
 #ifndef GET_SKBUFF_QOS
@@ -164,8 +164,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
 
        /*
-        * Prefetch the private data structure.  It is larger that one
-        * cache line.
+        * Prefetch the private data structure.  It is larger than the
+        * one cache line.
         */
        prefetch(priv);
 
@@ -290,8 +290,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
         * See if we can put this skb in the FPA pool. Any strange
         * behavior from the Linux networking stack will most likely
         * be caused by a bug in the following code. If some field is
-        * in use by the network stack and get carried over when a
-        * buffer is reused, bad thing may happen.  If in doubt and
+        * in use by the network stack and gets carried over when a
+        * buffer is reused, bad things may happen.  If in doubt and
         * you dont need the absolute best performance, disable the
         * define REUSE_SKBUFFS_WITHOUT_FREE. The reuse of buffers has
         * shown a 25% increase in performance under some loads.

diff --git a/drivers/staging/octeon/ethernet-util.h b/drivers/staging/octeon/ethernet-util.h
index 144fb99bf50cab8f88a83c070bbe1e05de8bbcfe..2da5ce17ead026cf25ae6f32980d0e47f87e9ae0 100644 (file)
--- a/drivers/staging/octeon/ethernet-util.h
+++ b/drivers/staging/octeon/ethernet-util.h
@@ -38,7 +38,7 @@ static inline void *cvm_oct_get_buffer_ptr(union cvmx_buf_ptr packet_ptr)
 }
 
 /**
- * INTERFACE - convert IPD port to locgical interface
+ * INTERFACE - convert IPD port to logical interface
  * @ipd_port: Port to check
  *
  * Returns Logical interface

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 9112cd8821540f692acfd5559183ad125459f73c..4d70acfd98ef11079f292341ffb2009732619b7b 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -356,7 +356,7 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev)
                        /* Force accept multicast packets */
                        control.s.mcst = 2;
                else
-                       /* Force reject multicat packets */
+                       /* Force reject multicast packets */
                        control.s.mcst = 1;
 
                if (dev->flags & IFF_PROMISC)