diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-13 17:00:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-13 17:00:33 -0700 |
| commit | b6dad5178ceaf23f369c3711062ce1f2afc33644 (patch) | |
| tree | 821f85015c58fead32b9553d68de40eecf3d65da | |
| parent | 15adb51c04ccfcf58ac3eec7464a2768fe175fcc (diff) | |
| parent | 85041e12418fd0c08ff972b7729f7971afb361f8 (diff) | |
| download | linux-b6dad5178ceaf23f369c3711062ce1f2afc33644.tar.gz | |
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
| -rw-r--r-- | arch/nios2/boot/dts/10m50_devboard.dts | 2 | ||||
| -rw-r--r-- | arch/nios2/boot/dts/3c120_devboard.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/boot/dts/10m50_devboard.dts b/arch/nios2/boot/dts/10m50_devboard.dts index 56339bef3247d5..0e7e5b0dd685c1 100644 --- a/arch/nios2/boot/dts/10m50_devboard.dts +++ b/arch/nios2/boot/dts/10m50_devboard.dts @@ -97,7 +97,7 @@ rx-fifo-depth = <8192>; tx-fifo-depth = <8192>; address-bits = <48>; - max-frame-size = <1518>; + max-frame-size = <1500>; local-mac-address = [00 00 00 00 00 00]; altr,has-supplementary-unicast; altr,enable-sup-addr = <1>; diff --git a/arch/nios2/boot/dts/3c120_devboard.dts b/arch/nios2/boot/dts/3c120_devboard.dts index d10fb81686c7ef..3ee31690637979 100644 --- a/arch/nios2/boot/dts/3c120_devboard.dts +++ b/arch/nios2/boot/dts/3c120_devboard.dts @@ -106,7 +106,7 @@ interrupt-names = "rx_irq", "tx_irq"; rx-fifo-depth = <8192>; tx-fifo-depth = <8192>; - max-frame-size = <1518>; + max-frame-size = <1500>; local-mac-address = [ 00 00 00 00 00 00 ]; phy-mode = "rgmii-id"; phy-handle = <&phy0>; |