projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
oki-semi
/
pch_gbe
/
pch_gbe_main.c
diff --git
a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 60eb890800ec44f3de488aca05ffad471d51e162..0c1c65a9ce5e31edb87ccb27e5bb377523f99f1d 100644
(file)
--- a/
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@
-2263,7
+2263,7
@@
static int pch_gbe_change_mtu(struct net_device *netdev, int new_mtu)
if (err) {
adapter->rx_buffer_len = old_rx_buffer_len;
pch_gbe_up(adapter);
- return
-ENOMEM
;
+ return
err
;
} else {
netdev->mtu = new_mtu;
adapter->hw.mac.max_frame_size = max_frame;