From ef0a604dc2fb6c6fe3e9231a8ee85890c6ef6e85 Mon Sep 17 00:00:00 2001 From: Torgny Johansson Date: Mon, 29 Jun 2009 07:26:20 -0400 Subject: mbm: merge updated Ericsson 'mbm' driver from git://gitorious.org/~torgny_j/modemmanager/mbm-mainline.git And other cleanups by Dan. --- plugins/mm-plugin-mbm.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'plugins/mm-plugin-mbm.c') diff --git a/plugins/mm-plugin-mbm.c b/plugins/mm-plugin-mbm.c index 0018ec9d..c4b58e55 100644 --- a/plugins/mm-plugin-mbm.c +++ b/plugins/mm-plugin-mbm.c @@ -1,26 +1,24 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* - Additions to NetworkManager, network-manager-applet and modemmanager - for supporting Ericsson modules like F3507g. - - Author: Per Hallsmark - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ + * Copyright (C) 2008 Ericsson AB + * + * Author: Per Hallsmark + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ #include #include @@ -187,7 +185,7 @@ supports_udi (MMPlugin *plugin, LibHalContext *hal_ctx, const char *udi) gboolean supported = FALSE; driver_name = get_driver (hal_ctx, udi); - if (driver_name && !strcmp (driver_name, "mbm")) { + if (driver_name && (!strcmp (driver_name, "cdc_ether") || !strcmp (driver_name, "mbm"))) { char **capabilities; char **iter; -- cgit v1.2.3-70-g09d2