From patchwork Sat Apr 21 15:26:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154507 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DEE0DB6EEB for ; Tue, 24 Apr 2012 03:09:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754781Ab2DWRJb (ORCPT ); Mon, 23 Apr 2012 13:09:31 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:61705 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754241Ab2DWRIX (ORCPT ); Mon, 23 Apr 2012 13:08:23 -0400 Received: from mailone.linux-pingi.de (p5497CD69.dip.t-dialin.net [84.151.205.105]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lx3gz-1SB4Cy2RNB-016bkF; Mon, 23 Apr 2012 19:08:22 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id CFBD64FD2; Mon, 23 Apr 2012 19:08:17 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id 0433B9FB98; Mon, 23 Apr 2012 19:05:50 +0200 (CEST) Date: Sat, 21 Apr 2012 17:26:30 +0200 Subject: [PATCH 21/28] mISDN: Add interface to allow upper layers to modify RX buffer limits From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, isdn4linux@listserv.isdn4linux.de Message-Id: <20120423170551.0433B9FB98@pingi6.linux-pingi.de> X-Provags-ID: V02:K0:r/8iYoE/jvJRPGw1vbDdiMDD9AkSnf7FfXLqdebnsjP ak/D+ytBr44rcT2iWk6qgXTqBLSJiBL3aGdH3FhT3ccl8WbdTq 23UaggLeo0HQ1CAmsjys4puVpvsVAyX8/mHLkVwEHEuO7TGJ4F xZ4VHJuqs1jELiJxV7C/7xkfwKo4uRaCoZHGcRffTzInJKHo+g Iaxc4+lWfw9GpNB/YlvG3Bx67JvjMyYW7eFRnmJvHFhBjFZjvH USb3F6oJLb7/G4ZLAe5J+OskflPJKK9YDHwYLs6RCUqre0OXUF qazDrcPm0FLsNIonHbhAIfHNFF+8MylSVDIC11uqtBRDlI/UOh iJBrOfPXzDyf1UlLIWEU4ddFkuPts4I0mDlNh4FTUgcu70bxpI 88ToR0RrjCEZE7a/b2m0jCk6aZ1k+8hQQs= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It seems to be useful to let applications decide the size of the data chunks they want receive. Signed-off-by: Karsten Keil --- drivers/isdn/hardware/mISDN/avmfritz.c | 17 +++++++++++++---- drivers/isdn/hardware/mISDN/mISDNipac.c | 17 +++++++++++++---- include/linux/mISDNif.h | 11 ++++++++++- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c index 4b1c86e..9cee744 100644 --- a/drivers/isdn/hardware/mISDN/avmfritz.c +++ b/drivers/isdn/hardware/mISDN/avmfritz.c @@ -835,15 +835,24 @@ init_card(struct fritzcard *fc) static int channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq) { - int ret = 0; + int ret = 0, o1, o2; struct fritzcard *fc = bch->hw; switch (cq->op) { case MISDN_CTRL_GETOP: - cq->op = 0; + cq->op = MISDN_CTRL_RX_BUFFER; + break; + case MISDN_CTRL_RX_BUFFER: + /* We return the old values */ + o1 = bch->minlen; + o2 = bch->maxlen; + if (cq->p1 != MISDN_CTRL_RX_SIZE_IGNORE) + bch->minlen = cq->p1; + if (cq->p2 != MISDN_CTRL_RX_SIZE_IGNORE) + bch->minlen = cq->p2; + cq->p1 = o1; + cq->p2 = o2; break; - /* Nothing implemented yet */ - case MISDN_CTRL_FILL_EMPTY: default: pr_info("%s: %s unknown Op %x\n", fc->name, __func__, cq->op); ret = -EINVAL; diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c index 1bc75ae..b32f5bb 100644 --- a/drivers/isdn/hardware/mISDN/mISDNipac.c +++ b/drivers/isdn/hardware/mISDN/mISDNipac.c @@ -1395,14 +1395,23 @@ hscx_l2l1(struct mISDNchannel *ch, struct sk_buff *skb) static int channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq) { - int ret = 0; + int ret = 0, o1, o2; switch (cq->op) { case MISDN_CTRL_GETOP: - cq->op = 0; + cq->op = MISDN_CTRL_RX_BUFFER; + break; + case MISDN_CTRL_RX_BUFFER: + /* We return the old values */ + o1 = bch->minlen; + o2 = bch->maxlen; + if (cq->p1 != MISDN_CTRL_RX_SIZE_IGNORE) + bch->minlen = cq->p1; + if (cq->p2 != MISDN_CTRL_RX_SIZE_IGNORE) + bch->minlen = cq->p2; + cq->p1 = o1; + cq->p2 = o2; break; - /* Nothing implemented yet */ - case MISDN_CTRL_FILL_EMPTY: default: pr_info("%s: unknown Op %x\n", __func__, cq->op); ret = -EINVAL; diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 850fe1f..b26de1a 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -37,7 +37,7 @@ */ #define MISDN_MAJOR_VERSION 1 #define MISDN_MINOR_VERSION 1 -#define MISDN_RELEASE 29 +#define MISDN_RELEASE 30 /* primitives for information exchange * generell format @@ -367,6 +367,7 @@ clear_channelmap(u_int nr, u_char *map) #define MISDN_CTRL_LOOP 0x00000001 #define MISDN_CTRL_CONNECT 0x00000002 #define MISDN_CTRL_DISCONNECT 0x00000004 +#define MISDN_CTRL_RX_BUFFER 0x00000008 #define MISDN_CTRL_GET_PCM_SLOTS 0x00000010 #define MISDN_CTRL_SET_PCM_SLOTS 0x00000020 #define MISDN_CTRL_SETPEER 0x00000040 @@ -394,6 +395,14 @@ clear_channelmap(u_int nr, u_char *map) #define MISDN_CTRL_L1_TS0_MODE 0x00010003 #define MISDN_CTRL_L1_GET_SYNC_INFO 0x00010004 +/* special RX buffer values for MISDN_CTRL_RX_BUFFER + * req.p1 is minimum buffer size, req.p2 the maximum + * MISDN_CTRL_RX_SIZE_ IGNORE value will not change but is still read back + */ +#define MISDN_CTRL_RX_SIZE_NOCHECK -1 +#define MISDN_CTRL_RX_SIZE_IGNORE -2 + + /* special PCM slot numbers */ #define MISDN_PCM_SLOT_DISABLE -1 /* PCM disabled */ #define MISDN_PCM_SLOT_IGNORE -2 /* PCM setting will be not changed */