Skip to content

Commit

Permalink
Merge branch 'macb-next'
Browse files Browse the repository at this point in the history
Cyrille Pitchen says:

====================
net/macb: add HW features to macb driver

this series of patches adds new hardware features to macb driver. These
features can be enabled/disabled at runtime using ethtool. Depending on
hardware and design configuration, some are enabled by default whereas other
are disabled.

For instance, checksum offload features are enabled by default for gem designed
for packet buffer mode but disabled for fifo mode design or for old macb.

Besides, the scatter-gather feature is enabled and tested on macb but disabled
on sama5d3x gem. When testing this feature on sama5d3x gem, TX lockups occured
frequently.

Also, the RX checksum offload feature is enabled at GEM level only when both
IFF_PROMISC bit is clear in dev->flags and NETIF_F_RXCSUM bit is set in
dev->features.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 25, 2014
2 parents ef49200 + 4b7b0e4 commit 1e3550e
Show file tree
Hide file tree
Showing 3 changed files with 399 additions and 75 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sama5d3_gmac.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
};

macb0: ethernet@f0028000 {
compatible = "cdns,pc302-gem", "cdns,gem";
compatible = "atmel,sama5d3-gem";
reg = <0xf0028000 0x100>;
interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default";
Expand Down
Loading

0 comments on commit 1e3550e

Please sign in to comment.