diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:34:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 19:34:21 -0400 |
commit | fb09bafda67041b74a668dc9d77735e36bd33d3b (patch) | |
tree | 2dd32b65062a95045468fdcab366ecdb8e4fcac6 /drivers/staging/octeon | |
parent | 94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9 (diff) | |
parent | c3c6cc91b0ae7b3d598488ad0b593bafba4a0817 (diff) |
Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree changes from Greg Kroah-Hartman:
"Here is the big staging tree pull request for the 3.5-rc1 merge
window.
Loads of changes here, and we just narrowly added more lines than we
added:
622 files changed, 28356 insertions(+), 26059 deletions(-)
But, good news is that there is a number of subsystems that moved out
of the staging tree, to their respective "real" portions of the
kernel.
Code that moved out was:
- iio core code
- mei driver
- vme core and bridge drivers
There was one broken network driver that moved into staging as a step
before it is removed from the tree (pc300), and there was a few new
drivers added to the tree:
- new iio drivers
- gdm72xx wimax USB driver
- ipack subsystem and 2 drivers
All of the movements around have acks from the various subsystem
maintainers, and all of this has been in the linux-next tree for a
while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up various trivial conflicts, along with a non-trivial one found
in -next and pointed out by Olof Johanssen: a clean - but incorrect -
merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually
as per Stephen Rothwell.
* tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
Staging: bcm: Remove two unused variables from Adapter.h
Staging: bcm: Removes the volatile type definition from Adapter.h
Staging: bcm: Rename all "INT" to "int" in Adapter.h
Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
Staging: bcm: Correctly format all comments in Adapter.h
Staging: bcm: Fix all whitespace issues in Adapter.h
Staging: bcm: Properly format braces in Adapter.h
Staging: ipack/bridges/tpci200: remove unneeded casts
Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
Staging: ipack: remove board_name and bus_name fields from struct ipack_device
Staging: ipack: improve the register of a bus and a device in the bus.
staging: comedi: cleanup all the comedi_driver 'detach' functions
staging: comedi: remove all 'default N' in Kconfig
staging: line6/config.h: Delete unused header
staging: gdm72xx depends on NET
staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
staging: drm/omap: initial dmabuf/prime import support
staging: drm/omap: dmabuf/prime mmap support
pstore/ram: Add ECC support
pstore/ram: Switch to persistent_ram routines
...
Diffstat (limited to 'drivers/staging/octeon')
-rw-r--r-- | drivers/staging/octeon/ethernet-rx.c | 2 | ||||
-rw-r--r-- | drivers/staging/octeon/ethernet-tx.c | 10 | ||||
-rw-r--r-- | drivers/staging/octeon/ethernet-util.h | 2 | ||||
-rw-r--r-- | drivers/staging/octeon/ethernet.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index d91751f9ffe..34afc16bc49 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c | |||
@@ -163,7 +163,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work) | |||
163 | /* | 163 | /* |
164 | * We received a packet with either an alignment error | 164 | * We received a packet with either an alignment error |
165 | * or a FCS error. This may be signalling that we are | 165 | * or a FCS error. This may be signalling that we are |
166 | * running 10Mbps with GMXX_RXX_FRM_CTL[PRE_CHK} | 166 | * running 10Mbps with GMXX_RXX_FRM_CTL[PRE_CHK] |
167 | * off. If this is the case we need to parse the | 167 | * off. If this is the case we need to parse the |
168 | * packet to determine if we can remove a non spec | 168 | * packet to determine if we can remove a non spec |
169 | * preamble and generate a correct packet. | 169 | * preamble and generate a correct packet. |
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 5877b2c64e2..5631dd9f820 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c | |||
@@ -62,7 +62,7 @@ | |||
62 | * You can define GET_SKBUFF_QOS() to override how the skbuff output | 62 | * You can define GET_SKBUFF_QOS() to override how the skbuff output |
63 | * function determines which output queue is used. The default | 63 | * function determines which output queue is used. The default |
64 | * implementation always uses the base queue for the port. If, for | 64 | * implementation always uses the base queue for the port. If, for |
65 | * example, you wanted to use the skb->priority fieid, define | 65 | * example, you wanted to use the skb->priority field, define |
66 | * GET_SKBUFF_QOS as: #define GET_SKBUFF_QOS(skb) ((skb)->priority) | 66 | * GET_SKBUFF_QOS as: #define GET_SKBUFF_QOS(skb) ((skb)->priority) |
67 | */ | 67 | */ |
68 | #ifndef GET_SKBUFF_QOS | 68 | #ifndef GET_SKBUFF_QOS |
@@ -165,8 +165,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) | |||
165 | #endif | 165 | #endif |
166 | 166 | ||
167 | /* | 167 | /* |
168 | * Prefetch the private data structure. It is larger that one | 168 | * Prefetch the private data structure. It is larger than the |
169 | * cache line. | 169 | * one cache line. |
170 | */ | 170 | */ |
171 | prefetch(priv); | 171 | prefetch(priv); |
172 | 172 | ||
@@ -291,8 +291,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) | |||
291 | * See if we can put this skb in the FPA pool. Any strange | 291 | * See if we can put this skb in the FPA pool. Any strange |
292 | * behavior from the Linux networking stack will most likely | 292 | * behavior from the Linux networking stack will most likely |
293 | * be caused by a bug in the following code. If some field is | 293 | * be caused by a bug in the following code. If some field is |
294 | * in use by the network stack and get carried over when a | 294 | * in use by the network stack and gets carried over when a |
295 | * buffer is reused, bad thing may happen. If in doubt and | 295 | * buffer is reused, bad things may happen. If in doubt and |
296 | * you dont need the absolute best performance, disable the | 296 | * you dont need the absolute best performance, disable the |
297 | * define REUSE_SKBUFFS_WITHOUT_FREE. The reuse of buffers has | 297 | * define REUSE_SKBUFFS_WITHOUT_FREE. The reuse of buffers has |
298 | * shown a 25% increase in performance under some loads. | 298 | * 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 144fb99bf50..2da5ce17ead 100644 --- 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) | |||
38 | } | 38 | } |
39 | 39 | ||
40 | /** | 40 | /** |
41 | * INTERFACE - convert IPD port to locgical interface | 41 | * INTERFACE - convert IPD port to logical interface |
42 | * @ipd_port: Port to check | 42 | * @ipd_port: Port to check |
43 | * | 43 | * |
44 | * Returns Logical interface | 44 | * Returns Logical interface |
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 60cba8194de..18f7a790f73 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c | |||
@@ -357,7 +357,7 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev) | |||
357 | /* Force accept multicast packets */ | 357 | /* Force accept multicast packets */ |
358 | control.s.mcst = 2; | 358 | control.s.mcst = 2; |
359 | else | 359 | else |
360 | /* Force reject multicat packets */ | 360 | /* Force reject multicast packets */ |
361 | control.s.mcst = 1; | 361 | control.s.mcst = 1; |
362 | 362 | ||
363 | if (dev->flags & IFF_PROMISC) | 363 | if (dev->flags & IFF_PROMISC) |