diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 01:56:37 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 01:56:37 +0100 |
| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /drivers/net/can/dev.c | |
| parent | Merge branch 'rmobile-fixes-for-linus' into rmobile-latest (diff) | |
| parent | audit: always follow va_copy() with va_end() (diff) | |
| download | linux-04cf399640b7acfa9abe2eb7900cd934db8af697.tar.xz linux-04cf399640b7acfa9abe2eb7900cd934db8af697.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/net/can/dev.c')
| -rw-r--r-- | drivers/net/can/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 25695bde0549..120f1ab5a2ce 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -454,7 +454,7 @@ static void can_setup(struct net_device *dev) /* New-style flags. */ dev->flags = IFF_NOARP; - dev->features = NETIF_F_NO_CSUM; + dev->features = NETIF_F_HW_CSUM; } struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) |