openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Justin P. Mattock 2012-03-26 21:34:18 -07:00 committed by Greg Kroah-Hartman
parent e06d9b3e6c
commit 215c47c931
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/octeon/ethernet-rx.c
View File

@ -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 * We received a packet with either an alignment error
* or a FCS error. This may be signalling that we are * 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 * off. If this is the case we need to parse the
* packet to determine if we can remove a non spec * packet to determine if we can remove a non spec
* preamble and generate a correct packet. * preamble and generate a correct packet.

10
drivers/staging/octeon/ethernet-tx.c
View File

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

2
drivers/staging/octeon/ethernet-util.h
View File

@ -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 * @ipd_port: Port to check
* *
* Returns Logical interface * Returns Logical interface

2
drivers/staging/octeon/ethernet.c
View File

@ -356,7 +356,7 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev)
/* Force accept multicast packets */ /* Force accept multicast packets */
control.s.mcst = 2; control.s.mcst = 2;
else else
/* Force reject multicat packets */ /* Force reject multicast packets */
control.s.mcst = 1; control.s.mcst = 1;
if (dev->flags & IFF_PROMISC) if (dev->flags & IFF_PROMISC)