From: David S. Miller Date: Thu, 20 Nov 2014 00:10:17 +0000 (-0500) Subject: Merge branch 'bonding_4ad' X-Git-Tag: v3.19-rc1~118^2~160 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=abd40774132b8dd474ee0ac1532df1af843ada59;p=linux.git Merge branch 'bonding_4ad' Xie Jianhua says: ==================== bonding: Introduce 4 AD link speed The speed field of AD Port Key was based on bitmask, it supported 5 kinds of link speed at most, as there were only 5 bits in the speed field of the AD Port Key. This patches series change the speed type (AD_LINK_SPEED_BITMASK) from bitmask to enum type in order to enhance speed type from 5 to 32, and then introduce 4 AD link speed to fix agg_bandwidth. ==================== Signed-off-by: David S. Miller --- abd40774132b8dd474ee0ac1532df1af843ada59