diff --git a/[refs] b/[refs] index 0258a290fedb..36b6e8f613c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fba1c31f4f3f9f860a4afee0b409cde27d06741 +refs/heads/master: 25dc27d17dc868aae78fd03bef3113cf586b12e5 diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c index baeb5bab05b5..60777fd90b33 100644 --- a/trunk/drivers/net/cpmac.c +++ b/trunk/drivers/net/cpmac.c @@ -56,7 +56,7 @@ module_param(dumb_switch, int, 0444); MODULE_PARM_DESC(debug_level, "Number of NETIF_MSG bits to enable"); MODULE_PARM_DESC(dumb_switch, "Assume switch is not connected to MDIO bus"); -#define CPMAC_VERSION "0.5.1" +#define CPMAC_VERSION "0.5.2" /* frame size + 802.1q tag + FCS size */ #define CPMAC_SKB_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN) #define CPMAC_QUEUES 8