@@ -1297,9 +1297,14 @@ static int switch_promisc(int newpromisc)
1297
1297
#define BEFORE2632 (x ,y )
1298
1298
#endif
1299
1299
1300
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION (3 ,17 ,0 )
1301
+ #define ctl_table struct ctl_table
1302
+ #endif
1303
+
1300
1304
#ifndef CONFIG_GRKERNSEC
1301
- #define ctl_table_no_const struct ctl_table
1305
+ #define ctl_table_no_const ctl_table
1302
1306
#endif
1307
+
1303
1308
/* sysctl /proc/sys/net/netflow */
1304
1309
static int hsize_procctl (ctl_table * ctl , int write , BEFORE2632 (struct file * filp ,)
1305
1310
void __user * buffer , size_t * lenp , loff_t * fpos )
@@ -1548,7 +1553,7 @@ static struct ctl_table_header *netflow_sysctl_header;
1548
1553
1549
1554
#if LINUX_VERSION_CODE < KERNEL_VERSION (2 ,6 ,20 )
1550
1555
#define _CTL_NAME (x ) .ctl_name = x,
1551
- static void ctl_table_renumber (struct ctl_table * table )
1556
+ static void ctl_table_renumber (ctl_table * table )
1552
1557
{
1553
1558
int c ;
1554
1559
@@ -1559,7 +1564,7 @@ static void ctl_table_renumber(struct ctl_table *table)
1559
1564
#define _CTL_NAME (x )
1560
1565
#define ctl_table_renumber (x )
1561
1566
#endif
1562
- static struct ctl_table netflow_sysctl_table [] = {
1567
+ static ctl_table netflow_sysctl_table [] = {
1563
1568
{
1564
1569
.procname = "active_timeout" ,
1565
1570
.mode = 0644 ,
@@ -1691,7 +1696,7 @@ static struct ctl_table netflow_sysctl_table[] = {
1691
1696
};
1692
1697
1693
1698
#if LINUX_VERSION_CODE < KERNEL_VERSION (2 ,6 ,25 )
1694
- static struct ctl_table netflow_sysctl_root [] = {
1699
+ static ctl_table netflow_sysctl_root [] = {
1695
1700
{
1696
1701
_CTL_NAME (33 )
1697
1702
.procname = "netflow" ,
@@ -1701,7 +1706,7 @@ static struct ctl_table netflow_sysctl_root[] = {
1701
1706
{ }
1702
1707
};
1703
1708
1704
- static struct ctl_table netflow_net_table [] = {
1709
+ static ctl_table netflow_net_table [] = {
1705
1710
{
1706
1711
.ctl_name = CTL_NET ,
1707
1712
.procname = "net" ,
0 commit comments