FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Update dahdi for alloc_netdev() api change in 3.17+

Browse Source 
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c835a677331495cf137a7f8a023463afd9f0~

Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Russ Meyerriecks 2014-08-07 16:20:19 -05:00
parent 8428452ad1
commit 91bc5a3b57
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/dahdi/datamods/hdlc_fr.c
View File

@ -1063,12 +1063,23 @@ static int fr_add_pvc(struct net_device *master, unsigned int dlci, int type)
used = pvc_is_used(pvc); used = pvc_is_used(pvc);
if (type == ARPHRD_ETHER) if (type == ARPHRD_ETHER) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
dev = alloc_netdev(sizeof(struct net_device_stats),
"pvceth%d", NET_NAME_UNKNOWN, ether_setup);
#else
dev = alloc_netdev(sizeof(struct net_device_stats), dev = alloc_netdev(sizeof(struct net_device_stats),
"pvceth%d", ether_setup); "pvceth%d", ether_setup);
else #endif
} else {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
dev = alloc_netdev(sizeof(struct net_device_stats),
"pvc%d", NET_NAME_UNKNOWN, dlci_setup);
#else
dev = alloc_netdev(sizeof(struct net_device_stats), dev = alloc_netdev(sizeof(struct net_device_stats),
"pvc%d", dlci_setup); "pvc%d", dlci_setup);
#endif
}
if (!dev) { if (!dev) {
printk(KERN_WARNING "%s: Memory squeeze on fr_pvc()\n", printk(KERN_WARNING "%s: Memory squeeze on fr_pvc()\n",

5
drivers/dahdi/datamods/hdlc_generic.c
View File

@ -282,7 +282,12 @@ static void hdlc_setup(struct net_device *dev)
struct net_device *alloc_hdlcdev(void *priv) struct net_device *alloc_hdlcdev(void *priv)
{ {
struct net_device *dev; struct net_device *dev;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
dev = alloc_netdev(sizeof(hdlc_device), "hdlc%d",
NET_NAME_UNKNOWN, hdlc_setup);
#else
dev = alloc_netdev(sizeof(hdlc_device), "hdlc%d", hdlc_setup); dev = alloc_netdev(sizeof(hdlc_device), "hdlc%d", hdlc_setup);
#endif
if (dev) if (dev)
dev_to_hdlc(dev)->priv = priv; dev_to_hdlc(dev)->priv = priv;
return dev; return dev;

6
drivers/dahdi/voicebus/voicebus_net.c
View File

@ -207,7 +207,13 @@ int vb_net_register(struct voicebus *vb, const char *board_name)
struct voicebus_netdev_priv *priv; struct voicebus_netdev_priv *priv;
const char our_mac[] = { 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}; const char our_mac[] = { 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
netdev = alloc_netdev(sizeof(*priv), board_name,
NET_NAME_UNKNOWN, ether_setup);
#else
netdev = alloc_netdev(sizeof(*priv), board_name, ether_setup); netdev = alloc_netdev(sizeof(*priv), board_name, ether_setup);
#endif
if (!netdev) if (!netdev)
return -ENOMEM; return -ENOMEM;
priv = netdev_priv(netdev); priv = netdev_priv(netdev);

6
drivers/dahdi/wctc4xxp/base.c
View File

@ -657,7 +657,13 @@ wctc4xxp_net_register(struct wcdte *wc)
struct wcdte_netdev_priv *priv; struct wcdte_netdev_priv *priv;
const char our_mac[] = { 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}; const char our_mac[] = { 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
netdev = alloc_netdev(sizeof(*priv), wc->board_name,
NET_NAME_UNKNOWN, ether_setup);
#else
netdev = alloc_netdev(sizeof(*priv), wc->board_name, ether_setup); netdev = alloc_netdev(sizeof(*priv), wc->board_name, ether_setup);
#endif
if (!netdev) if (!netdev)
return -ENOMEM; return -ENOMEM;
priv = netdev_priv(netdev); priv = netdev_priv(netdev);