diff options
| author | Greg Kroah-Hartman | 2012-05-02 20:48:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-05-02 20:48:07 +0200 |
| commit | d210267741fb2a8b6d741d9040703683a39087f4 (patch) | |
| tree | bfc1cdf7925644367cec4c82f2a5fb6d4c51a8eb /drivers/staging/octeon/ethernet-tx.c | |
| parent | Linux 3.4-rc5 (diff) | |
| parent | Staging: comedi: fix line over 80 character issue in rtd520.c (diff) | |
| download | kernel-qcow2-linux-d210267741fb2a8b6d741d9040703683a39087f4.tar.gz kernel-qcow2-linux-d210267741fb2a8b6d741d9040703683a39087f4.tar.xz kernel-qcow2-linux-d210267741fb2a8b6d741d9040703683a39087f4.zip | |
Merge 3.4-rc5 into staging-next
This resolves the conflict in:
drivers/staging/vt6656/ioctl.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet-tx.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-tx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 91a97b3e45c6..2d4fcea892f7 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -62,7 +62,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 @@ -165,8 +165,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); @@ -291,8 +291,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. |