From: David S. Miller Date: Mon, 2 Jun 2014 23:01:37 +0000 (-0700) Subject: Merge branch 'cdc_ncm' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7d507ac28ab9a17f28fd8c8be82f9255a1f72834;p=deliverable%2Flinux.git Merge branch 'cdc_ncm' Bjørn Mork says: ==================== cdc_ncm: fixes and conversion to sysfs API After considering the comments received after the ethtool coalesce support was commited, I have ended up concluding that we should remove it again, while we can, before it hits a release. The idea was not well enough thought through, and all comments received pointed to advantages of using a sysfs based API instead. This series removes the ethtool coalesce support and replaces it with sysfs attributes in a driver specific group under the netdev. The first 3 patches are unrelated fixes: patch 1: reducing truesize as discussed patch 2: fixing a potentional buffer overrun when changing tx_max patch 3: prevent framing errors when changing rx_max Changes v2: - minor editorial changes to patch 8, as suggested by Peter Stuge ==================== Signed-off-by: David S. Miller --- 7d507ac28ab9a17f28fd8c8be82f9255a1f72834