diff --git a/[refs] b/[refs] index 1336fa0f6ff4..d662d4771f15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12ebc8b9af7e29ff4dc77ee0e73a6b1de513d659 +refs/heads/master: b4516a288e71c64d7e214902250baf78b7b3cdcf diff --git a/trunk/include/net/llc.h b/trunk/include/net/llc.h index f2d0fc570527..9e7d7f08ef77 100644 --- a/trunk/include/net/llc.h +++ b/trunk/include/net/llc.h @@ -151,7 +151,6 @@ extern int sysctl_llc2_ack_timeout; extern int sysctl_llc2_busy_timeout; extern int sysctl_llc2_p_timeout; extern int sysctl_llc2_rej_timeout; -extern int sysctl_llc_station_ack_timeout; #else #define llc_sysctl_init() (0) #define llc_sysctl_exit() do { } while(0) diff --git a/trunk/net/llc/sysctl_net_llc.c b/trunk/net/llc/sysctl_net_llc.c index d75306b9c2f3..612a5ddaf93b 100644 --- a/trunk/net/llc/sysctl_net_llc.c +++ b/trunk/net/llc/sysctl_net_llc.c @@ -47,13 +47,6 @@ static struct ctl_table llc2_timeout_table[] = { }; static struct ctl_table llc_station_table[] = { - { - .procname = "ack_timeout", - .data = &sysctl_llc_station_ack_timeout, - .maxlen = sizeof(long), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, { }, };