Skip to content

Commit b6dad51

Browse files
committed
Merge tag 'nios2_fix_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux
Pull NIOS2 dts fix from Dinh Nguyen: - Fix tse_mac "max-frame-size" property * tag 'nios2_fix_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: nios2: dts: Fix tse_mac "max-frame-size" property
2 parents 15adb51 + 85041e1 commit b6dad51

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/nios2/boot/dts/10m50_devboard.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
rx-fifo-depth = <8192>;
9898
tx-fifo-depth = <8192>;
9999
address-bits = <48>;
100-
max-frame-size = <1518>;
100+
max-frame-size = <1500>;
101101
local-mac-address = [00 00 00 00 00 00];
102102
altr,has-supplementary-unicast;
103103
altr,enable-sup-addr = <1>;

arch/nios2/boot/dts/3c120_devboard.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
interrupt-names = "rx_irq", "tx_irq";
107107
rx-fifo-depth = <8192>;
108108
tx-fifo-depth = <8192>;
109-
max-frame-size = <1518>;
109+
max-frame-size = <1500>;
110110
local-mac-address = [ 00 00 00 00 00 00 ];
111111
phy-mode = "rgmii-id";
112112
phy-handle = <&phy0>;

0 commit comments

Comments
 (0)